手动缴费

src/dashoo.cn/frontend_web/src/api/oilsupplier/paymentinfo.js

@@ -45,5 +45,19 @@ export default {
       url: '/paymentinfo/delete/' + entityId,
       method: 'delete'
     })
+  },
+  getBillListbc (params, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/get-bill-list',
+      method: 'post',
+      data: params
+    })
+  },
+  receiveMoneyBillList (params, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/receive-money-bill-list',
+      method: 'post',
+      data: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/icbclist.vue

@@ -0,0 +1,357 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item>银行账单</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 供应商账单
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="组织机构代码">
+            <el-input v-model="searchForm.commercialNo" size="small" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">获取账单</el-button>
+
+            <!--<el-button type="warning" size="mini" icon="el-icon-search" @click="handleCheckBill">对账功能</el-button>-->
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <el-form label-width="120px" :inline="true">
+        <el-form-item label="企业名称">
+          <span>{{getSupplierName()}}</span>
+        </el-form-item>
+        <el-form-item label="组织机构代码">
+          <span>{{getUSCCode()}}</span>
+        </el-form-item>
+        <el-form-item label="缴费总金额">
+          <span style="font-weight: bold; color: red;">{{amountSum()}} 元</span>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="el-icon-money" @click="handleGetMoney">收款成功</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>-->
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+          <template slot-scope="scope">
+            {{ transferStr(scope.row.PayType) }}
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/paymentinfo'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'paymentinfo',
+
+    data () {
+      return {
+        dialogVisible: false,
+        delevisble: false,
+        // 列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        // 工作流
+        entrydetail: {
+          process: 'oil_audit_apply',
+          business: '',
+          instance: ''
+        },
+        // 查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: ''
+        },
+        searchForm: {
+          commercialNo: ''
+
+        }
+      }
+    },
+    created () {
+      // 查询条件初始值备份
+      // Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      // this.initDatas()
+      // this.getDictOptions()
+    },
+    methods: {
+      initDatas () {
+        // 分页及列表条件
+        let params = {
+          commercialNo: this.searchForm.commercialNo
+        }
+        // 访问接口
+        console.log(params)
+        api.getBillListbc(params, this.$axios).then(res => {
+          console.log(res)
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions () {
+        api.getDictList(this.$axios).then(res => {
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand (command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby (column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+
+      transferStr (val) {
+        if (val === '1') {
+          return '准入缴费'
+        }else if (val === '2') {
+          return '年审缴费'
+        }else if (val === '3') {
+          return '增项缴费'
+        } else {
+          return val
+        }
+      },
+      RndNum(n){
+        let rnd="";
+        for(var i=0;i<n;i++)
+          rnd+=Math.floor(Math.random()*10);
+        return rnd;
+      },
+      handleGetMoney () {
+        let idlist = ''
+        let sumMoeny = 0.0
+        for (let idx in this.entityList) {
+          idlist += this.entityList[idx].Id + ','
+          sumMoeny += this.entityList[idx].Amount + 0.0
+        }
+        let params = {
+          ids: idlist,
+          receiveAmount: sumMoeny,
+          bankName: '现场缴费',
+          bankSerialNum: this.RndNum(11) + '_SD',
+          payDate: new Date(),
+          payMode: '现金'
+        }
+        // 下面调用接口修改状态
+        api.receiveMoneyBillList(params, this.$axios).then(res => {
+          console.log(res)
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      handleGetMoneyAgain () {
+        let idlist = ''
+        let sumMoeny = 0.0
+        for (let idx in this.entityList) {
+          idlist += this.entityList[idx].Id + ','
+          sumMoeny += this.entityList[idx].Amount + 0.0
+        }
+        let params = {
+          ids: idlist,
+          receiveAmount: sumMoeny,
+          bankName: '工商银行',
+          bankSerialNum: '111222',
+          payDate: new Date(),
+          payMode: '银行现金'
+        }
+        //下面调用接口修改状态
+        api.receiveMoneyAgain(params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      handleCheckBill () {
+        let params = {
+          startTime: new Date('2019-1-1'),
+          endTime: new Date('2019-10-10')
+        }
+        // 访问接口
+        api.checkMoneyList(params, this.$axios).then(res => {
+          console.log(res)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity (row) {
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      GetCommand (cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
+      jstimehandle (val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      },
+      amountSum () {
+        var s = 0
+        if (this.entityList || this.entityList != null) {
+          for (var i = this.entityList.length - 1; i >= 0; i--) {
+            s += parseInt(this.entityList[i].Amount)
+          }
+          return s
+        }
+      },
+      getUSCCode () {
+        if (this.entityList != null && this.entityList.length > 0) {
+          return this.entityList[0].USCCode
+        }
+      },
+      getSupplierName () {
+        if (this.entityList != null && this.entityList.length > 0) {
+          return this.entityList[0].SupplierName
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+
+</style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/index.vue

@@ -9,7 +9,8 @@
         <span>
           <i class="icon icon-table2"></i> 缴费信息列表
         </span>
-        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+        <!--<el-button type="primary" size="mini" style="float: right;margin-top: -3px;margin-left: 15px" @click="addpayinfo">添加缴费信息</el-button>-->
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px;">
           <!--<el-form-item label="缴费日期">-->
             <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
@@ -35,6 +36,7 @@
             </el-dropdown>
           </el-form-item>
         </el-form>
+
       </div>
       <el-table :data="entityList" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="180" align="center" fixed="right">
@@ -52,30 +54,6 @@
               <el-button slot="reference" plain type="danger" title="删除" style="margin-left:10px"
                          size="mini">删除</el-button>
             </el-popover>
-            <!-- <el-popover placement="top" title="提示">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover> -->
-            <!--<el-dropdown @command="MoreCmdClick">-->
-              <!--<el-button size="mini" type="primary" plain style="margin-left:5px;">-->
-                <!--更多<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-              <!--</el-button>-->
-              <!--<el-dropdown-menu slot="dropdown">-->
-                <!--&lt;!&ndash;<el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>&ndash;&gt;-->
-                <!--<el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>-->
-                  <!--删除数据-->
-                <!--</el-dropdown-item>-->
-              <!--</el-dropdown-menu>-->
-            <!--</el-dropdown>-->
           </template>
         </el-table-column>
 
@@ -95,114 +73,40 @@
       </el-pagination>
     </el-card>
 
-    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+    <el-dialog title="添加缴费信息" :visible.sync="dialogVisible" width="720px">
       <el-form ref="searchForm" label-width="110px">
         <el-row>
 
-          <!-- <el-col :span="12">
-            <el-form-item label="生成时间">
-              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-          </el-col> -->
-          <!--
           <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <el-col :span="12">
-            <el-form-item label="推荐单位编码">
+            <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="准入编码">
+            <el-form-item label="项目类型">
               <el-input size="mini" v-model="searchForm.AccessCardNo" style="width:100%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="准入类别">
+            <el-form-item label="缴费类型">
               <el-input size="mini" v-model="searchForm.SupplierTypeName" style="width:100%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="企业名称">
+            <el-form-item label="缴费金额">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <!--
-          <el-col :span="12">
-            <el-form-item label="工程项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="履约执行情况">
-              <el-input size="mini" v-model="searchForm.Performance" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="准入范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!--
-          <el-col :span="12">
-            <el-form-item label="审核状态">
-              <el-select size="mini" v-model="searchform.Status" style="width:100%" placeholder="请选择">
-                <el-option label="已申请" value="0"></el-option>
-                <el-option label="初审通过" value="1"></el-option>
-                <el-option label="初审未通过" value="2"></el-option>
-                <el-option label="专业审核通过" value="3"></el-option>
-                <el-option label="审核未通过" value="4"></el-option>
-                <el-option label="已交费" value="5"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="录入员">
-              <el-input size="mini" v-model="searchForm.EnterUserName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="年审日期">
-              <el-input size="mini" v-model="searchForm.ApplyTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="审核日期">
-              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!--
-          <el-col :span="12">
-            <el-form-item label="退回原因">
-              <el-input size="mini" v-model="searchForm.BackReason" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">添 加</el-button>
       </span>
     </el-dialog>
   </div>
@@ -223,6 +127,7 @@
 
     data () {
       return {
+        payVisible: false,
         dialogVisible: false,
         delevisble: false,
         // 列表数据
@@ -276,6 +181,9 @@
       // this.getDictOptions()
     },
     methods: {
+      addpayinfo () {
+        this.dialogVisible = true
+      },
       initDatas () {
         // 分页及列表条件
         let params = {
@@ -317,7 +225,7 @@
 
       searchCommand (command) {
         if (command === 'search') {
-          this.dialogVisible = true
+
         } else if (command === 'clear') {
           this.clearSearch()
         }
@@ -353,7 +261,6 @@
 
       handleSearch () {
         this.currentPage = 1
-        this.dialogVisible = false
         this.initDatas()
       },
       handleCurrentChange (value) {