缴费管理

src/dashoo.cn/backend/api/business/paymentinfo/paymentinfo.go

@@ -1,7 +1,30 @@
 package paymentinfo
 
-type Paymentinfo struct {
-	SupplierTypeCode    string
-	SupplierTypeName    string
-	SupplierName        string
+import "time"
+
+type OilPaymentInfo struct {
+	Id             int       `xorm:"not null pk autoincr INT(11)"`
+	SupplierId     int       `xorm:"comment('Supplier表') INT(11)"`
+	SupplierCertId int       `xorm:"comment('SupplierCert表') INT(11)"`
+	Amount         string    `xorm:"comment('缴费金额') DECIMAL(10,2)"`
+	IsPay          string    `xorm:"comment('是否缴费 1 是 2否') VARCHAR(5)"`
+	PayMode        string    `xorm:"comment('缴费方式') VARCHAR(10)"`
+	PayType        string    `xorm:"comment('缴费类型 1 准入缴费 2 年审缴费') VARCHAR(10)"`
+	PayDate        time.Time `xorm:"comment('缴费日期') DATETIME"`
+	BankSerialNum  string    `xorm:"comment('银行流水号') VARCHAR(50)"`
+	BankName       string    `xorm:"comment('银行名称') VARCHAR(100)"`
+	Remark         string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId   int       `xorm:"INT(11)"`
+	CreateOn       time.Time `xorm:"DATETIME"`
+	CreateBy       string    `xorm:"VARCHAR(50)"`
+	ModifiedOn     time.Time `xorm:"DATETIME"`
+	ModifiedUserId int       `xorm:"INT(11)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+}
+
+type PaymentinfoList struct {
+	OilPaymentInfo      `xorm:"extends"`
+	SupplierTypeCode string
+	SupplierTypeName string
+	SupplierName     string
 }

src/dashoo.cn/backend/api/business/paymentinfo/paymentinfoService.go

@@ -16,23 +16,21 @@ func GetPaymentService(xormEngine *xorm.Engine) *PaymentService {
 	return s
 }
 
-func (s *PaymentService) GetPaymentinfoList(pageIndex, itemsPerPage int64, order string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+func (s *PaymentService) GetPaymentinfoList(pageIndex, itemsPerPage int64, order string, asc string, entitiesPtr interface{}, where string) (total int64) {
 	var err error
 	var resultsSlice []map[string][]byte
-	sqlconunt := "SELECT COUNT(c.Id) FROM OilSupplierCert c " +
-		"LEFT JOIN OilSupplier o ON c.SupplierId=o.Id where " + where
+	sqlconunt := "SELECT COUNT(Id) FROM OilPaymentInfo WHERE IsPay = '1'　"
 
-	sql := "SELECT c.SupplierTypeCode, c.SupplierTypeName,o.SupplierName " +
-		"FROM OilSupplierCert c LEFT JOIN OilSupplier o ON c.SupplierId=o.Id "
+	sql := "SELECT c.SupplierTypeCode,c.SupplierTypeName,s.SupplierName,p.* " +
+		"FROM OilPaymentInfo p " +
+		"LEFT JOIN OilSupplier s ON p.SupplierId = s.Id " +
+		"LEFT JOIN OilSupplierCert c ON p.SupplierCertId = c.Id " +
+		"WHERE "+ where +
+		" Order By " + order + asc + " Limit " + strconv.Itoa(int(itemsPerPage)) +" OFFSET " + strconv.Itoa((int(pageIndex)-1)*int(itemsPerPage))
 
 	resultsSlice, err = s.DBE.Query(sqlconunt)
-	if (asc) {
-		err = s.DBE.SQL(sql).Asc(order).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Find(entitiesPtr)
+	err = s.DBE.SQL(sql).Find(entitiesPtr)
 
-	} else {
-		err = s.DBE.SQL(sql).Desc(order).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Find(entitiesPtr)
-	}
-	//err = s.DBE.S(sql).Where(where).Limit(int(itemsPerPage), (int(pageIndex)-1)*int(itemsPerPage)).Desc(order).Find(entitiesPtr)
 	LogError(err)
 	if len(resultsSlice) > 0 {
 		results := resultsSlice[0]
@@ -44,4 +42,29 @@ func (s *PaymentService) GetPaymentinfoList(pageIndex, itemsPerPage int64, order
 	}
 	return total
 
+}
+
+func (s *PaymentService) GetPaymentinfoById(Id string, entitiesPtr interface{}) (err error) {
+
+	sql := "SELECT c.SupplierTypeCode,c.SupplierTypeName,s.SupplierName,p.* " +
+		"FROM OilPaymentInfo p " +
+		"LEFT JOIN OilSupplier s ON p.SupplierId = s.Id " +
+		"LEFT JOIN OilSupplierCert c ON p.SupplierCertId = c.Id " +
+		"WHERE p.Id="+ Id
+
+	err = s.DBE.SQL(sql).Find(entitiesPtr)
+
+	LogError(err)
+
+	return err
+
+}
+
+// Amount 缴费金额   PayType 缴费类型 1 准入缴费  2 年审缴费
+func (s *PaymentService) AddPaymentinfo(SupplierId int, SupplierCertId int, Amount float64, PayType string)(err error){
+	//var err error
+	sql := "INSERT INTO OilPaymentInfo (SupplierId, SupplierCertId, Amount, PayType) VALUES" +
+		"(? ,? , ?, ?)"
+	_,err = s.DBE.Exec(sql, SupplierId, SupplierCertId, Amount, PayType)
+	return  err
 }

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

@@ -4,6 +4,8 @@ import (
 	"dashoo.cn/backend/api/business/paymentinfo"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
+	"encoding/json"
+	"time"
 )
 
 type PaymentInfoController struct {
@@ -12,21 +14,36 @@ type PaymentInfoController struct {
 
 // @Title 获取列表
 // @Description get user by token
-// @Success 200 {object} []suppliercert.OilSupplierCert
+// @Success 200 {object} []paymentinfo.PaymentinfoList
 // @router /list [get]
 func (this *PaymentInfoController) GetEntityList() {
 
 	//获取分页信息
 	page := this.GetPageInfoForm()
+
+	orderby := "p.Id"
 	where := " 1=1 "
-	where = where + " and c.Status = '5'"
-	asc := false
+	asc := " DESC"
+	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	SupplierName := this.GetString("SupplierName")
+	IsPay := this.GetString("IsPay")
+
+	if (IsPay != "") {
+		where = where + " and p.IsPay = '" + IsPay +"'"
+	}
+
+	if (SupplierTypeCode != "") {
+		where = where + " and c.SupplierTypeCode like '%" + SupplierTypeCode + "%'"
+	}
+	if (SupplierName != "") {
+		where = where + " and s.SupplierName like '%" + SupplierName + "%'"
+	}
 	//svc := suppliercert.GetOilSupplierCertService(utils.DBE)
 	//var list []suppliercert.OilSupplierCert
 
-	var paylist []paymentinfo.Paymentinfo
+	var paylist []paymentinfo.PaymentinfoList
 	svc := paymentinfo.GetPaymentService(utils.DBE)
-	total := svc.GetPaymentinfoList( page.CurrentPage, page.Size, "c.Id", asc, &paylist, where)
+	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
@@ -36,3 +53,67 @@ func (this *PaymentInfoController) GetEntityList() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} paymentinfo.PaymentinfoList
+// @router /get/:id [get]
+func (this *PaymentInfoController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+	var model []paymentinfo.PaymentinfoList
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+	svc.GetPaymentinfoById(Id, &model)
+
+	this.Data["json"] = &model[0]
+	this.ServeJSON()
+}
+
+// @Title 修改实体
+// @Description 修改实体
+// @Param 	body body paymentinfo.Paymentinfo
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *PaymentInfoController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model paymentinfo.OilPaymentInfo
+	svc := paymentinfo.GetPaymentService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+		"IsPay",
+		"PayMode",
+		"PayDate",
+		"BankSerialNum",
+		"BankName",
+		"Remark",
+		"ModifiedOn",
+		"ModifiedUserId",
+		"ModifiedBy",
+	}
+	_,err := svc.UpdateEntityByIdCols(id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -5,5 +5,18 @@ export default {
       method: 'GET',
       params: params
     })
+  },
+  getEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/get/' + entityId,
+      method: 'GET'
+    })
+  },
+  updateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/paymentinfo/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
   }
 }

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

@@ -499,7 +499,7 @@
 
         },
         setForm: {
-          SupplierTypeCode: '2',
+          SupplierTypeCode: '02',
           SupplierTypeName: '基建类',
           AuditStepCode: '',
           AuditStepName: ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/operation.vue

@@ -18,7 +18,7 @@
         </span>
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
-        
+
         <!-- <el-row>
 
           <el-col :span="8">
@@ -430,7 +430,7 @@
               </el-switch>
             </el-form-item>
           </el-col>
-<!-- 
+<!--
           <el-col :span="6">
             <el-form-item label="">
               <el-switch v-model="formData.F41">
@@ -473,7 +473,7 @@
             </el-form-item>
           </el-col> -->
 
-          
+
         </el-row>
       </el-form>
     </el-card>
@@ -577,8 +577,8 @@
       console.log(this.serviceId);
       if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
+        ;
+      } else {this.initDatas()
         this.formData.Id = 0;
       }
     },

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

@@ -621,7 +621,7 @@
 
         },
         setForm: {
-          SupplierTypeCode: '1',
+          SupplierTypeCode: '01',
           SupplierTypeName: '物质类',
           AuditStepCode: '',
           AuditStepName: ''

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/_opera/operation.vue

@@ -0,0 +1,184 @@
+<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" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交缴费</el-button>
+          <router-link :to="'/oilsupplier/paymentinfo'">
+            <el-button type="primary" size="mini">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-form ref="EntityForm" :model="formData" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="公司名称">
+              <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目类型">
+              <el-input v-model="formData.SupplierTypeName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="缴费金额">
+              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="true" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="缴费类型">
+              <el-select v-model="formData.PayType" disabled >
+                <el-option label="准入缴费" value="1"></el-option>
+                <el-option label="年审缴费" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="缴费方式">
+              <el-input v-model="formData.PayMode" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="缴费日期">
+              <el-date-picker
+                v-model="formData.PayDate"
+                type="date"
+                placeholder="选择日期" :disabled="formData.IsPay == '2'">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="银行流水号">
+              <el-input v-model="formData.BankSerialNum" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="银行名称">
+              <el-input v-model="formData.BankName" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item :span="24" style="text-align: center;">
+          <el-button type="primary" size="small" @click="updateEntity" v-if="formData.IsPay == '1'"><i class="el-icon-circle-check"></i>保存</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/paymentinfo'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'paymentinfoEdit',
+
+    data () {
+      return {
+        serviceId: '',
+        formData: {
+          SupplierTypeCode: '',
+          SupplierTypeName: '',
+          SupplierName: '',
+          Id: '',
+          SupplierId: '',
+          SupplierCertId: '',
+          Amount: '',
+          IsPay: '',
+          PayMode: '',
+          PayType: '',
+          PayDate: new Date(),
+          BankSerialNum: '',
+          BankName: '',
+          Remark: '',
+          CheckDate: new Date(),
+          CreateUserId: '',
+          CreateOn: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        }
+      }
+    },
+    created () {
+      this.formData.Id = this.$route.params.opera
+      this.initDatas()
+    },
+    methods: {
+      initDatas () {
+        if (this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            console.log(res.data, 'res.data')
+            this.formData = res.data
+            if (this.formData && this.formData.PayDate === '0001-01-01T00:00:00Z') {
+              this.formData.PayDate = new Date()
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      updateEntity () {
+        api.updateEntity(this.formData.Id, this.formData, 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)
+        })
+      },
+      submitPay () {
+        this.$confirm('提交之后将不能修改数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.formData.IsPay = '2'
+          api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              // 保存成功后，初始化数据，变成修改
+              this.initDatas()
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -10,22 +10,25 @@
           <i class="icon icon-table2"></i> 缴费信息列表
         </span>
         <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>
+          <!--<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>-->
+          <!--</el-form-item>-->
+          <el-form-item label="公司名称">
+            <el-input v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
-          <el-form-item label="缴费类别">
-            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+          <el-form-item label="项目类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
               <el-option label="物资类" value="01"></el-option>
-              <el-option label="技术服务类" value="03"></el-option>
               <el-option label="基建类" value="02"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <!--<el-dropdown-item command="search">高级查询</el-dropdown-item>-->
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -35,8 +38,8 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/annuaudit/' + scope.row.Id + '/operation'">
-              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+            <router-link :to="'/oilsupplier/paymentinfo/' + scope.row.Id + '/operation'">
+              <el-button type="primary" plain title="查看详情" size="mini">缴费</el-button>
             </router-link>
             <!-- <el-popover placement="top" title="提示">
               <el-alert
@@ -51,62 +54,29 @@
               </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--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <!--<el-dropdown-item :command="GetCommand('JiaoHe', scope.row)" v-if="scope.row.CheckStatus == 1">数据校核</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('ShenHe', scope.row)" v-if="scope.row.CheckStatus == 2">数据审核</el-dropdown-item>-->
-                <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
-                  删除数据
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
+            <!--<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>
 
-        <!--<el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"-->
-                         <!--:label="column.label" align="center" show-overflow-tooltip>-->
-        <!--</el-table-column>-->
         <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="SupplierTypeCode" label="缴费类型"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeCode" label="缴费金额">
-
+        <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 sortable min-width="110" align="center" prop="Status" label="审核状态">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="初审未通过" type="warning">-->
-            <!--</el-alert>-->
-            <!--<el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="审核未通过" type="error">-->
-            <!--</el-alert>-->
-            <!--<el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="已申请" type="info">-->
-            <!--</el-alert>-->
-            <!--<el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="初审通过" type="success">-->
-            <!--</el-alert>-->
-            <!--<el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="已交费" type="success">-->
-            <!--</el-alert>-->
-            <!--<el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"-->
-                      <!--title="专业审核通过" type="success">-->
-            <!--</el-alert>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column prop="ApplyTime" sortable min-width="100" label="年审日期" align="center" show-overflow-tooltip>-->
-          <!--<template slot-scope="scope">-->
-            <!--{{ jstimehandle(scope.row.ApplyTime+'') }}-->
-          <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column prop="CreateOn" sortable min-width="100" 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"
@@ -238,12 +208,10 @@
         authUser: 'authUser'
       })
     },
-    name: 'annualaudit',
+    name: 'paymentinfo',
 
     data () {
       return {
-        historyVisible: false,
-        addshow: false,
         dialogVisible: false,
         delevisble: false,
         // 列表数据
@@ -276,16 +244,9 @@
         },
         searchForm: {
           Id: '',
-          RecUnitId: '',
-          AccessCardNo: '',
-          SupplierTypeName: '',
+          SupplierTypeCode: '',
           SupplierName: '',
-          Num: '',
-          ProjectName: '',
-          Performance: '',
-          WorkRange: '',
-          Status: '',
-          BackReason: '',
+          IsPay: '1',
           CreateOn: '',
           CreateUserId: '',
           CreateBy: '',
@@ -324,10 +285,10 @@
         // 查询条件
         Object.assign(params, this.searchForm)
         // 访问接口
+        console.log(params)
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
-          console.log(this.entityList, 'this.entityList')
         }).catch(err => {
           console.error(err)
         })
@@ -366,6 +327,17 @@
         this.CreateOn = ''
         this.initDatas()
       },
+
+      transferStr (val) {
+        if (val === '1') {
+          return '准入缴费'
+        } if (val === '2') {
+          return '年审缴费'
+        } else {
+          return val
+        }
+      },
+
       handleSearch () {
         this.currentPage = 1
         this.dialogVisible = false
@@ -399,20 +371,6 @@
         })
       },
 
-      getvalues (val) {
-        this.entrydetail.business = val.Id
-        this.entrydetail.instance = val.WorkflowId
-        this.historyVisible = true
-      },
-
-      MoreCmdClick (cmd) {
-        if (cmd.Command === 'History') {
-          this.getvalues(cmd.row)
-        } else if (cmd.Command === 'Delete') {
-          this.deleteEntity(cmd.row)
-        }
-      },
-
       GetCommand (cmdType, row) {
         let cmd = {}
         cmd.Command = cmdType

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

@@ -0,0 +1,326 @@
+<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" style="height: calc(100vh - 115px);">
+      <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-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
+                            <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+          <!--</el-form-item>-->
+          <el-form-item label="公司名称">
+            <el-input v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+          <el-form-item label="项目类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+              <el-option label="物资类" value="01"></el-option>
+              <el-option label="基建类" value="02"></el-option>
+              <el-option label="技术服务类" value="03"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <!--<el-dropdown-item command="search">高级查询</el-dropdown-item>-->
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="180" align="center" fixed>
+          <template slot-scope="scope">
+            <router-link :to="'/oilsupplier/paymentinfo/' + scope.row.Id + '/operation'">
+              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+            </router-link>
+          </template>
+        </el-table-column>
+
+        <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 sortable min-width="120" align="center" show-overflow-tooltip prop="PayMode" label="缴费方式">
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="缴费日期">
+          <template slot-scope="scope">
+          {{ jstimehandle(scope.row.PayDate+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="BankSerialNum" label="银行流水号">
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="BankName" label="银行名称">
+        </el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" 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>
+
+    <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-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-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-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-input size="mini" v-model="searchForm.SupplierName" 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>
+      </span>
+    </el-dialog>
+  </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: {
+          Id: '',
+          SupplierTypeCode: '',
+          SupplierName: '',
+          IsPay: '2',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+
+        }
+      }
+    },
+    created () {
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.initDatas()
+      // this.getDictOptions()
+    },
+    methods: {
+      initDatas () {
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        console.log(params)
+        api.getList(myCreateOn.join(','), params, this.$axios).then(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 '准入缴费'
+        } if (val === '2') {
+          return '年审缴费'
+        } else {
+          return val
+        }
+      },
+
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      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
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -286,7 +286,7 @@
           Remark: ''
         },
         setForm: {
-          SupplierTypeCode: '3',
+          SupplierTypeCode: '03',
           SupplierTypeName: '技术服务类',
           AuditStepCode: '',
           AuditStepName: ''