生成缴费记录

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualaudit.go

@@ -7,7 +7,7 @@ import (
 type OilAnnualAudit struct {
 	Id               int       `xorm:"not null pk autoincr INT(10)"`
 	RecUnitId        string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
-	CerId            string    `xorm:"comment('准入ID') INT(10)"`
+	CerId            int    `xorm:"comment('准入ID') INT(10)"`
 	AccessCardNo     string    `xorm:"comment('准入证号') VARCHAR(50)"`
 	SupplierTypeName string    `xorm:"comment('准入类别') VARCHAR(50)"`
 	SupplierName     string    `xorm:"comment('企业名称') VARCHAR(50)"`

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

@@ -3,6 +3,7 @@ package oilsupplier
 import (
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/organize"
+	"dashoo.cn/backend/api/business/paymentinfo"
 	"dashoo.cn/business2/areajson"
 	"dashoo.cn/business2/items"
 
@@ -278,7 +279,7 @@ func (this *AnnualAuditController) AddEntity() {
 	var suppliermodel supplier.OilSupplierView
 	suppliermodel = list[0]
 	model.RecUnitId = suppliermodel.RecUnitId
-	model.CerId = suppliermodel.CertId
+	model.CerId, _ = strconv.Atoi(suppliermodel.CertId)
 	model.Status = 0
 	model.BackReason = suppliermodel.BackReason
 	model.CreateOn = time.Now()
@@ -291,20 +292,20 @@ func (this *AnnualAuditController) AddEntity() {
 	//启动工作流
 	processInstanceId := svcActiviti.StartProcess(workflow.OIL_AUDIT_APPLY, utils.ToStr(annualId), this.User.Id)
 	//获得有审核权限的人员
-	var users []userRole.Base_RoleList
-	var userIds string
-	var auditWorkflow auditsetting.Base_OilAuditSetting
-	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, firstAudit, workflow.FIRST_TRIAL, &auditWorkflow)
-	users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), "")
-	for _, tmpUser := range users {
-		userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
-	}
-	userIds = strings.Trim(userIds, ",")
+	//var users []userRole.Base_RoleList
+	//var userIds string
+	//var auditWorkflow auditsetting.Base_OilAuditSetting
+	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, firstAudit, workflow.FIRST_TRIAL, &auditWorkflow)
+	//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), "")
+	//for _, tmpUser := range users {
+	//	userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
+	//}
+	//userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
 	ActiComplete.BusinessKey = strconv.Itoa(annualId)
-	ActiComplete.UserNames = userIds
+	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
 	ActiComplete.Result = "1"
 	ActiComplete.Remarks = "提交给二级单位初审"
@@ -549,6 +550,16 @@ func (this *AnnualAuditController) AnnualAudit() {
 		}
 		if receiveVal == "true" {
 			_, err := svc.UpdateEntityByIdCols(dataother.AnnualId, auditmodel, cols)
+			paysvc := paymentinfo.GetPaymentService(utils.DBE)
+			var Amount float64
+			if list.SupplierTypeName == "01" {
+				Amount =  6000
+			}else if list.SupplierTypeName == "02"{
+				Amount = 7000
+			}else if list.SupplierTypeName == "03" {
+				Amount = 8000
+			}
+			err = paysvc.AddPaymentinfo(list.SupplierId, list.CerId, Amount,"2")
 			if err == nil {
 				errinfo.Message = "审核通过！"
 				errinfo.Code = 0
@@ -604,3 +615,4 @@ func (this *AnnualAuditController) AnnualAudit() {
 		}
 	}
 }
+

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

@@ -3,6 +3,7 @@ package oilsupplier
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"encoding/json"
+	"strconv"
 	"strings"
 	"time"
 
@@ -294,7 +295,7 @@ func (this *QualChangeController) AddEntity() {
 	var suppliermodel supplier.OilSupplierView
 	suppliermodel = list[0]
 	model.RecUnitId = suppliermodel.RecUnitId
-	model.CerId = suppliermodel.CertId
+	model.CerId, _ = strconv.Atoi(suppliermodel.CertId)
 	model.Status = 0
 	model.BackReason = suppliermodel.BackReason
 	//svc.GetEntitysByWhere(""+OilSupplierName, supwhere, &supplierlist)

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

@@ -39,7 +39,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/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId">
+            <router-link
+              :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId">
               <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
             </router-link>
             <el-dropdown @command="MoreCmdClick">
@@ -172,13 +173,20 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="初审单位">
-              <el-select ref="selectauditOrg" v-model="entityForm.FirstAudit" placeholder="请选择"
-                         style="width: 100%" filterable allow-create default-first-option>
-                <el-option
-                  v-for="item in organizeOption"
-                  :key="item.Id"
-                  :label="item.Fullname"
-                  :value="item.Id">
+              <el-select ref="selectauditOrg" v-model="entityForm.FirstAudit" placeholder="请选择" style="width: 100%"
+                @change="auditOrgChang" filterable allow-create default-first-option>
+                <el-option v-for="item in organizeOption" :key="item.Id" :label="item.Fullname" :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+                allow-create default-first-option>
+                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -222,6 +230,8 @@
         dialogVisible: false,
         delevisble: false,
         organizeOption: [], // 审批部门
+        auditerOption: [],
+        auditer: '',
         //列表数据
         selectsupplierlist: [],
         entityList: [],
@@ -249,7 +259,7 @@
           SupplierName: '',
           SupplierId: '',
           SupplierTypeName: '',
-          FirstAudit:'',
+          FirstAudit: '',
         },
         searchForm: {
           Id: '',
@@ -317,7 +327,7 @@
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
-          console.log("---this.entityList ----",this.entityList )
+          console.log("---this.entityList ----", this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -373,7 +383,24 @@
         })
       },
 
-      getDictOptions () {
+      auditOrgChang(val) {
+        this.auditerOption = []
+        this.auditer = ''
+        supplierapi.getAuditerByDept(val, this.$axios).then(res => {
+          if (res.data.item.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该单位未设置审批人员！'
+            })
+            return
+          }
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
         supplierapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']