费用确认单界面功能

src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/register"
 	"encoding/json"
 	"strconv"
 	"time"
@@ -175,3 +176,49 @@ func (this *PaymentInfoController) UpdateEntity() {
 		this.ServeJSON()
 	}
 }
+
+type BillInfoSure struct {
+	SupplierEntity supplier.OilSupplier
+	DataInfo DataInfo
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} BillInfoSure
+// @router /getbillinfo [get]
+func (this *PaymentInfoController) GetBillInfo() {
+	regSvc := register.GetOilCorporateInfoService(utils.DBE)
+	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
+
+	var corporateInfo register.OilCorporateInfo
+	regSvc.GetEntity(&corporateInfo, "UserId='"+ this.User.Id +"'")
+
+	var supplierEntity supplier.OilSupplier
+	supplierSvc.GetEntity(&supplierEntity, "CommercialNo='"+ corporateInfo.CommercialNo +"'")
+
+	billInfoSure := new(BillInfoSure)
+	billInfoSure.SupplierEntity = supplierEntity
+
+	page := this.GetPageInfoForm()
+
+	orderby := "p.Id"
+	where :=  "p.SupplierId='"+ strconv.Itoa(supplierEntity.Id) +"' and p.IsPay='0' "
+	var paylist []paymentinfo.PaymentinfoList
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+	total := svc.GetPaymentinfoList(page.CurrentPage, page.Size, orderby, " ASC", &paylist, where)
+	//total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = paylist
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+
+	/*var models []paymentinfo.OilPaymentInfo
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+	svc.GetEntities(&models, "SupplierId='"+ strconv.Itoa(supplierEntity.Id) +"' and IsPay='0' ")
+	*/
+	billInfoSure.DataInfo = datainfo
+
+	this.Data["json"] = &billInfoSure
+	this.ServeJSON()
+}

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

@@ -18,5 +18,12 @@ export default {
       method: 'post',
       data: formData
     })
-  }
+  },
+  getBillList (params, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/getbillinfo',
+      method: 'GET',
+      params: params
+    })
+  },
 }

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

@@ -0,0 +1,238 @@
+<template>
+  <div>
+    <!--<el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/paymentinfo' }">缴费列表</el-breadcrumb-item>
+    </el-breadcrumb>-->
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 缴费确认
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0">确认缴费单</el-button>
+        </span>
+      </div>
+      <div class="table-layout" style="margin-top: 0px">
+        <el-row>
+          <el-col :span="4" class="table-cell-title">单位名称</el-col>
+          <el-col :span="4" class="table-cell-title">税号</el-col>
+          <el-col :span="4" class="table-cell-title">地址</el-col>
+          <el-col :span="4" class="table-cell-title">电话</el-col>
+          <el-col :span="4" class="table-cell-title">法人姓名</el-col>
+          <el-col :span="4" class="table-cell-title">成立时间</el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.SupplierName}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.CommercialNo}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.Address}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.Telphone}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.LegalPerson}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.SetupTime}}</el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="4" class="table-cell-title">注册资本</el-col>
+          <el-col :span="4" class="table-cell-title">开户银行</el-col>
+          <el-col :span="4" class="table-cell-title">银行账号</el-col>
+          <el-col :span="4" class="table-cell-title">联系人姓名</el-col>
+          <el-col :span="4" class="table-cell-title">移动电话</el-col>
+          <el-col :span="4" class="table-cell-title">财务电话</el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.RegCapital}} 万元</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.DepositBank}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.BankAccount}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.ContactName}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.Mobile}}</el-col>
+          <el-col :span="4" class="table-cell">{{this.formDataSup.CompanyTel}}</el-col>
+        </el-row>
+      </div>
+      <div style="height: 10px"></div>
+      <el-table :data="entityList" size="mini" border 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-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </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'
+  import supapi from '@/api/oilsupplier/supplier'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'paymentinfoEdit',
+
+    data () {
+      return {
+        dialogVisible: false,
+        serviceId: '',
+        entityList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        formDataSup: {}
+      }
+    },
+    created () {
+      this.initDatas()
+    },
+    methods: {
+      transferStr (val) {
+        if (val === '1') {
+          return '准入缴费'
+        } else if (val === '2') {
+          return '年审缴费'
+        } else if (val === '3') {
+          return '增项缴费'
+        } else {
+          return val
+        }
+      },
+      // 列表排序功能
+      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()
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+
+      initDatas () {
+        // 分页及列表条件
+        let params = {
+          _currentPage: 1,
+          _size: 1000,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        }
+        api.getBillList(params, this.$axios).then(res => {
+          this.entityList = res.data.DataInfo.items
+          this.currentItemCount = res.data.DataInfo.currentItemCount
+          this.formDataSup = res.data.SupplierEntity
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      submitPay () {
+        this.$confirm('提交之后将不能修改数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+
+        })
+      },
+
+      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)
+        }
+      },
+
+    }
+  }
+</script>
+
+<style scoped>
+  .detail-container {
+    width: 80%;
+    padding: 20px 20px 20px 20px;
+    margin: 20px auto;
+  }
+
+  .operate-container {
+    background: #F2F6FC;
+    height: 80px;
+    margin: -20px -20px 0;
+    line-height: 80px;
+  }
+
+  .operate-button-container {
+    float: right;
+    margin-right: 20px
+  }
+
+  .table-layout {
+    margin-top: 20px;
+    border-left: 1px solid #DCDFE6;
+    border-top: 1px solid #DCDFE6;
+  }
+
+  .table-cell {
+    height: 60px;
+    line-height: 40px;
+    border-right: 1px solid #DCDFE6;
+    border-bottom: 1px solid #DCDFE6;
+    padding: 10px;
+    font-size: 14px;
+    color: #606266;
+    text-align: center;
+    overflow: hidden;
+  }
+
+  .table-cell-title {
+    border-right: 1px solid #DCDFE6;
+    border-bottom: 1px solid #DCDFE6;
+    padding: 10px;
+    background: #F2F6FC;
+    text-align: center;
+    font-size: 14px;
+    color: #303133;
+  }
+</style>
+