财务待办

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

@@ -0,0 +1,28 @@
+package invoiceinfo
+
+import (
+	"time"
+)
+
+type OilInvoiceInfo struct {
+	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	SrcIds         string    `xorm:"VARCHAR(255)"`
+	SupplierId     int       `xorm:"comment('Supplier') INT(11)"`
+	CommercialNo   string    `xorm:"comment('社会统一信用代码') VARCHAR(20)"`
+	SupplierName   string    `xorm:"VARCHAR(100)"`
+	Address        string    `xorm:"comment('注册地址') VARCHAR(255)"`
+	DepositBank    string    `xorm:"comment('开户行') VARCHAR(255)"`
+	BankAccount    string    `xorm:"comment('银行账号') VARCHAR(255)"`
+	Amount         float64   `xorm:"DECIMAL(10,2)"`
+	IsInvoice      string    `xorm:"default '0' comment('是否已开发票 0 否 1 是') VARCHAR(5)"`
+	InvoiceOn      time.Time `xorm:"comment('开票时间') DATETIME"`
+	BankSerialNum  string    `xorm:"VARCHAR(50)"`
+	Remark         string    `xorm:"VARCHAR(255)"`
+	WorkflowId     string    `xorm:"VARCHAR(50)"`
+	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)"`
+}

src/dashoo.cn/backend/api/business/invoiceinfo/invoiceinfoService.go

@@ -0,0 +1,16 @@
+package invoiceinfo
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type InvoiceService struct {
+	MyServiceBase
+}
+
+func GetInvoiceService(xormEngine *xorm.Engine) *InvoiceService {
+	s := new(InvoiceService)
+	s.DBE = xormEngine
+	return s
+}

src/dashoo.cn/backend/api/business/invoiceinfo/invoiceinfoSession.go

@@ -0,0 +1,16 @@
+package invoiceinfo
+
+import (
+	. "dashoo.cn/backend/api/mydb"
+	"github.com/go-xorm/xorm"
+)
+
+type OilInvoiceInfoSession struct {
+	MySessionBase
+}
+
+func GetOilInvoiceInfoSession(session *xorm.Session) *OilInvoiceInfoSession {
+	s := new(OilInvoiceInfoSession)
+	s.Session = session
+	return s
+}

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

@@ -12,6 +12,7 @@ type OilPaymentInfo struct {
 	ProjectName    string    `xorm:"comment('项目名称') VARCHAR(100)"`
 	Amount         string    `xorm:"comment('缴费金额') DECIMAL(10,2)"`
 	IsPay          string    `xorm:"comment('是否缴费 1 是 2否') VARCHAR(5)"`
+	IsInvoice      string    `xorm:"comment('是已开发票 1 是 0否') VARCHAR(5)"`
 	IsVerify       string    `xorm:"comment('是否对账 1 是 0否') VARCHAR(5) DEFAULT '0'"`
 	PayMode        string    `xorm:"comment('缴费方式') VARCHAR(10)"`
 	PayType        string    `xorm:"comment('缴费类型 1 准入缴费 2 年审缴费') VARCHAR(10)"`
@@ -40,6 +41,7 @@ type Del_OilPaymentInfo struct {
 	ProjectName    string    `xorm:"comment('项目名称') VARCHAR(100)"`
 	Amount         string    `xorm:"comment('缴费金额') DECIMAL(10,2)"`
 	IsPay          string    `xorm:"comment('是否缴费 1 是 2否') VARCHAR(5)"`
+	IsInvoice      string    `xorm:"comment('是已开发票 1 是 0否') VARCHAR(5)"`
 	PayMode        string    `xorm:"comment('缴费方式') VARCHAR(10)"`
 	PayType        string    `xorm:"comment('缴费类型 1 准入缴费 2 年审缴费') VARCHAR(10)"`
 	PayDate        time.Time `xorm:"comment('缴费日期') DATETIME"`

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

@@ -65,6 +65,25 @@ func (s *PaymentService) GetPaymentinfoById(Id string, entitiesPtr interface{})
 
 }
 
+func (s *PaymentService) GetPaymentinfoList1(where 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 "
+
+	if where != "" {
+		sql = sql + " where " + where
+	}
+
+	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

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

@@ -25,4 +25,5 @@ const (
 	INFOCHANGE  string = "4" // 信息变更
 	REGISTER    string = "5" // 注册
 	STORAGE string = "7" // 入库
+	INVOICE string = "8" //待开发票
 )

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

@@ -126,6 +126,8 @@ const (
 	OIL_REGISTER_APPLY string ="oil_register_apply"
     // 企业入库
 	OIL_SUPPLIER_INSTORE string = "oil_supplier_instore"
+	// 待开发票
+	OIL_SUPPLIER_VERIFY string = "oil_supplier_verify"
 
 	// 分办
 	SUB_OFFICE_WZ string = "SUB_OFFICE_WZ"

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -71,6 +71,16 @@ func (this *UserController) Get() {
 	usermodel := svc.GetUserInfoSelf(this.User.Username)
 	//	var companyentity company.Base_Company
 	//	svc.GetEntityById(usermodel.AccCode, &companyentity)
+
+	ridArr := svc.GetUserRoleIds(strconv.Itoa(usermodel.Id))
+
+	Roleids := strings.Replace(strings.Join(ridArr, ","), "rid_", "", -1)
+
+	//Roleids := ""
+	//for _, id := range ridArr {
+	//	Roleids = Roleids + "," + id
+	//}
+
 	var user models.User
 	user.Id = utils.ToStr(usermodel.Id)
 	user.Username = usermodel.Username
@@ -88,6 +98,7 @@ func (this *UserController) Get() {
 	user.Profile.IsCompanyUser = usermodel.IsCompanyUser
 	user.Profile.Superior = usermodel.Superior
 	user.Profile.Id = usermodel.Id
+	user.Profile.Roleids = Roleids
 	// todo 从this.User获取用户名，再查询出具体用户
 	//	user := models.User{"user01", "张三", models.Profile{Gender: "male", Age: 20, Address: "china", Email: "123zs@gmail.com", Realname: "ppppppp"}}
 	this.Data["json"] = user

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

@@ -1016,6 +1016,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 				payinfo.SupplierName = supplierEntity.SupplierName
 				payinfo.PayType = "2"
 				payinfo.IsPay = "0"
+				payinfo.IsInvoice = "0"
 				payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
 				payinfo.CreateUserId = list.CreateUserId
 				payinfo.CreateBy = list.CreateBy

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

@@ -0,0 +1,113 @@
+package oilsupplier
+
+import (
+	"dashoo.cn/backend/api/business/invoiceinfo"
+	"dashoo.cn/backend/api/business/paymentinfo"
+	"dashoo.cn/backend/api/business/workflow"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+	"fmt"
+	"time"
+)
+
+type OilInvoiceController struct {
+	BaseController
+}
+
+// @Title 获取信息
+// @Description get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /getinvoicedata [get]
+func (this *OilInvoiceController) GetInvoiceData() {
+
+	id := this.GetString("Id")
+	dictList := make(map[string]interface{})
+
+	svc := invoiceinfo.GetInvoiceService(utils.DBE)
+	var entity invoiceinfo.OilInvoiceInfo
+	where := "Id=" + id
+	svc.GetEntity(&entity, where)
+
+	var paylist []paymentinfo.PaymentinfoList
+	svcp := paymentinfo.GetPaymentService(utils.DBE)
+	where = "p.Id in (" + entity.SrcIds + ")"
+	svcp.GetPaymentinfoList1(where, &paylist)
+
+	dictList["invoiceinfo"] = entity
+	dictList["paymentinfos"] = paylist
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
+// @Title 更新发票状态
+// @Description 更新发票状态
+// @Success	200	{object} controllers.Request
+// @router /updateisinvoice [get]
+func (this *OilInvoiceController) UpdateIsInvoice() {
+
+	id := this.GetString("Id")
+	srcIds := this.GetString("SrcIds")
+	session := utils.DBE.NewSession()
+	defer session.Close()
+	err := session.Begin()
+
+	cols := []string{"IsInvoice", "InvoiceOn"}
+	svc := invoiceinfo.GetOilInvoiceInfoSession(session)
+	var info invoiceinfo.OilInvoiceInfo
+	info.IsInvoice = "1"
+	info.InvoiceOn = time.Now()
+	_, err = svc.UpdateEntityByIdCols(id, &info, cols)
+
+	var errinfo ErrorInfo
+	if err != nil {
+		session.Rollback()
+		errinfo.Code = -1
+		errinfo.Message = "操作失败！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var payinfo paymentinfo.OilPaymentInfo
+	payinfo.IsInvoice = "1"
+	paycols := []string{"IsInvoice"}
+	where := "Id in (" + srcIds + ")"
+	err = svc.UpdateEntityBywheretbl(OilPaymentInfoName, &payinfo, paycols, where)
+
+	if err != nil {
+		session.Rollback()
+		errinfo.Code = -1
+		errinfo.Message = "操作失败！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	var ActiComplete workflow.ActiCompleteVM
+	ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_VERIFY
+	ActiComplete.BusinessKey = id
+	ActiComplete.UserId = this.User.Id
+	ActiComplete.Remarks = ""
+	ActiComplete.Result = "1"
+
+	receiveVal := svcActiviti.TaskComplete(ActiComplete)
+	fmt.Println(receiveVal)
+	if receiveVal == "true" {
+		session.Commit()
+		errinfo.Code = 0
+		errinfo.Message = "操作成功！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		session.Rollback()
+		errinfo.Code = -1
+		errinfo.Message = "操作失败！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/backend/api/business/invoiceinfo"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/oilactivity"
 	"dashoo.cn/backend/api/business/oilsupplier/paymentbankinfo"
@@ -10,8 +11,8 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/register"
 	"dashoo.cn/backend/api/business/workflow"
-	"dashoo.cn/business2/parameter"
-	"dashoo.cn/business2/userRole"
+	"dashoo.cn/business3/parameter"
+	"dashoo.cn/business3/userRole"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -47,6 +48,7 @@ func (this *PaymentInfoController) GetEntityList() {
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	SupplierName := this.GetString("SupplierName")
 	IsPay := this.GetString("IsPay")
+	IsInvoice := this.GetString("IsInvoice")
 
 	if IsPay != "" {
 		if IsPay == "0" {
@@ -55,7 +57,9 @@ func (this *PaymentInfoController) GetEntityList() {
 			where = where + " and p.IsPay = '" + IsPay + "'"
 		}
 	}
-
+	if IsInvoice != "" {
+		where = where + " and c.IsInvoice = '" + IsInvoice + "'"
+	}
 	if SupplierTypeCode != "" {
 		where = where + " and c.SupplierTypeCode like '%" + SupplierTypeCode + "%'"
 	}
@@ -385,7 +389,12 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 	sql += " where Id in (" + strIds + ") and IsPay = '1'"
 	svc.DBE.Query(sql)
 
+	supplierId := 0
+	srcids := ""
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	for _, payItem := range paymentInfos {
+		supplierId = payItem.SupplierId
+		srcids = srcids + "," + strconv.Itoa(payItem.Id)
 		if payItem.PayType == "1" { //准入
 
 			var cert suppliercert.OilSupplierCert
@@ -487,6 +496,44 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 			appsvc.UpdateEntityBywheretbl(OilSupplierCertAppendName, &appendmodel, []string{"Status"}, appdwhere)
 		}
 	}
+
+	// 待开发票
+
+	var suppentity supplier.OilSupplier
+	where := "Id=" + strconv.Itoa(supplierId)
+	svc.GetEntity(&suppentity, where)
+
+	var ivinfo invoiceinfo.OilInvoiceInfo
+	ivinfo.SrcIds = strings.Trim(srcids, ",")
+	ivinfo.Amount = billParams.ReceiveAmount
+	ivinfo.BankSerialNum = billParams.BankSerialNum
+	ivinfo.IsInvoice = "0"
+	ivinfo.SupplierId = supplierId
+	ivinfo.SupplierName = suppentity.SupplierName
+	ivinfo.CommercialNo = suppentity.CommercialNo
+	ivinfo.Address = suppentity.Address
+	ivinfo.BankAccount = suppentity.BankAccount
+	ivinfo.DepositBank = suppentity.DepositBank
+	ivinfo.CreateOn = time.Now()
+
+	svc.InsertEntity(&ivinfo)
+
+	usvc := userRole.GetUserService(utils.DBE)
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	financeRoleId := paramSvc.GetBaseparameterMessage("", "paramset", "FinanceRoleId")
+	ids := usvc.GetUserIdsByRoleId(financeRoleId)
+	tempstr := strings.Join(ids, ",")
+	uids := strings.Replace(tempstr, "uid_", "", -1)
+	uids = strings.Trim(uids, ",")
+
+	businessKey := strconv.Itoa(ivinfo.Id)
+	result := "1"
+	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_VERIFY, businessKey, uids, result, "04", suppentity.SupplierName)
+	ivinfo.WorkflowId = processInstanceId
+	cols := []string{"WorkflowId"}
+	svc.UpdateEntityByIdCols(ivinfo.Id, &ivinfo, cols)
+
+
 	//记录对账日志
 	paymentBankInfo := new(paymentbankinfo.OilPaymentBankInfo)
 	paymentBankInfo.BillIds = billParams.Ids

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

@@ -1141,6 +1141,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					payinfo.PayType = "1"
 					payinfo.Amount = strconv.FormatFloat(Amount, 'E', -1, 64)
 					payinfo.IsPay = "0"
+					payinfo.IsInvoice = "0"
 					payinfo.CreateUserId = supplierCertEntity.CreateUserId
 					payinfo.CreateBy = supplierCertEntity.CreateBy
 					payinfo.CreateOn = time.Now()
@@ -1214,7 +1215,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					paysvc.InsertEntity(&payinfo)
 					//发短信
 					toMobile := supplierEntity.Mobile
-					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认交费信息！"
+					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，`！"
 					msgService := msg2.GetMsgService(utils.DBE)
 					msgService.HandleMsg(toMobile, msg, "3-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 

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

@@ -866,6 +866,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 						payinfo.SupplierName = supplierEntity.SupplierName
 						payinfo.PayType = "3"
 						payinfo.IsPay = "0"
+						payinfo.IsInvoice = "0"
 						payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
 						payinfo.CreateUserId = supplierCertAppendEntity.CreateUserId
 						payinfo.CreateBy = supplierCertAppendEntity.CreateBy

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/invoiceinfo"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
@@ -29,7 +30,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 
 	page := this.GetPageInfoForm()
 
-	stype := this.GetString("Type") // 1 准入 2 增项 3 年审 4 信息变更 5 注册 6 待入库
+	stype := this.GetString("Type") // 1 准入 2 增项 3 年审 4 信息变更 5 注册 6 待入库 7 待开发票
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 	wfNames := ""
@@ -45,6 +46,8 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		wfNames = workflow.OIL_REGISTER_APPLY
 	} else if stype == "6" {
 		wfNames = workflow.OIL_SUPPLIER_INSTORE
+	} else if stype == "7" {
+		wfNames = workflow.OIL_SUPPLIER_VERIFY
 	}
 
 	var todoliststemp []todolist.TodoList
@@ -165,6 +168,22 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
 			}
+		} else if wfName == workflow.OIL_SUPPLIER_VERIFY {
+			//待开发票
+			var todo todolist.TodoList
+			regsvc := invoiceinfo.GetInvoiceService(utils.DBE)
+			var listinfo invoiceinfo.OilInvoiceInfo
+			has = regsvc.GetEntityById(id, &listinfo)
+			if has {
+				todo.Id = listinfo.Id
+				todo.Type = todolist.INVOICE
+				todo.SupplierName = listinfo.SupplierName
+				todo.UserName = this.User.Realname
+				todo.TaskName = item.TaskName
+				todo.Status = "未开"
+				todo.CreateTime = item.CreateTime
+				todoliststemp = append(todoliststemp, todo)
+			}
 		}
 	}
 
@@ -224,6 +243,8 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		wfNames = workflow.OIL_REGISTER_APPLY
 	} else if stype == "6" {
 		wfNames = workflow.OIL_SUPPLIER_INSTORE
+	} else if stype == "7" {
+		wfNames = workflow.OIL_SUPPLIER_VERIFY
 	}
 
 	var todoliststemp []todolist.TodoList
@@ -334,6 +355,22 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
 			}
+		} else if wfName == workflow.OIL_SUPPLIER_VERIFY {
+			//待开发票
+			var todo todolist.TodoList
+			regsvc := invoiceinfo.GetInvoiceService(utils.DBE)
+			var listinfo invoiceinfo.OilInvoiceInfo
+			has = regsvc.GetEntityById(id, &listinfo)
+			if has {
+				todo.Id = listinfo.Id
+				todo.Type = todolist.INVOICE
+				todo.SupplierName = listinfo.SupplierName
+				todo.UserName = this.User.Realname
+				todo.TaskName = item.TaskName
+				todo.Status = "已开"
+				todo.CreateTime = item.CreateTime
+				todoliststemp = append(todoliststemp, todo)
+			}
 		}
 
 	}

src/dashoo.cn/backend/api/models/user.go

@@ -43,6 +43,7 @@ type Profile struct {
 	IsCompanyUser int
 	Id           int
 	Superior     string
+	Roleids      string
 }
 
 //func AddUser(u User) string {

src/dashoo.cn/backend/api/routers/router.go

@@ -420,6 +420,12 @@ func init() {
 				&oilsupplier.OilCatalogController{},
 			),
 		),
+		//发票
+		beego.NSNamespace("/invoiceinfo",
+			beego.NSInclude(
+				&oilsupplier.OilInvoiceController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -176,8 +176,8 @@ module.exports = {
 
     'pages/oilsupplier/suppliernopass/*.*',
     // 'pages/oilsupplier/supplierps/*.*',
-    // 'pages/oilsupplier/supplierstorage/*.*',
-    // 'pages/oilsupplier/supplierstore/*.*',
+    'pages/oilsupplier/supplierstorage/*.*',
+    'pages/oilsupplier/supplierstore/*.*',
     'pages/oilsupplier/tablefieldsetting/*.*',
     'pages/oilsupplier/technologyservice/*.*',
     'pages/system/*/*.*',

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

@@ -168,4 +168,18 @@ export default {
       params: params
     })
   },
+  getInvoiceData (params, myAxios) {
+    return myAxios({
+      url: '/invoiceinfo/getinvoicedata',
+      method: 'get',
+      params: params
+    })
+  },
+  updateIsInvoice (params, myAxios) {
+    return myAxios({
+      url: '/invoiceinfo/updateisinvoice',
+      method: 'get',
+      params: params
+    })
+  }
 }

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

@@ -57,6 +57,7 @@
               <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
               <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
             </template>
           </el-table-column>
 
@@ -123,6 +124,7 @@
                 <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{scope.row.TaskName}}</span>
                 <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{scope.row.TaskName}}</span>
                 <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
+                <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
               </template>
             </el-table-column>
             <el-table-column label="类别" prop="SupplierTypeCode">
@@ -258,6 +260,69 @@
         <el-button  type="primary" size="mini" @click="ComAudit" v-if="formData.CheckStatus == 0">审核</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="待开发票" :visible.sync="invoiceVisible">
+      <el-card class="box-card">
+        <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 待开发票
+        </span>
+          <span style="float: right;">
+          <el-form ref="form" :inline="true" style="margin-top: -10px">
+            <el-form-item>
+              <el-button type="primary" size="mini" style="margin-right: 15px" @click="confirmIsInvoice()" v-if="this.formDataInvoice.IsInvoice == '0'">确认</el-button>
+            </el-form-item>
+          </el-form>
+        </span>
+        </div>
+        <div class="table-layout" style="margin-top: 0px">
+          <el-row>
+            <el-col :span="6" class="table-cell-title">单位名称</el-col>
+            <el-col :span="6" class="table-cell-title">税号</el-col>
+            <el-col :span="12" class="table-cell-title">注册地址</el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="6" class="table-cell">{{this.formDataInvoice.SupplierName}}</el-col>
+            <el-col :span="6" class="table-cell">{{this.formDataInvoice.CommercialNo}}</el-col>
+            <el-col :span="12" class="table-cell">{{this.formDataInvoice.Address}}</el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12" class="table-cell-title">开户银行</el-col>
+            <el-col :span="12" class="table-cell-title">银行账号</el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="table-cell">{{this.formDataInvoice.DepositBank}}</el-col>
+            <el-col :span="12" class="table-cell">{{this.formDataInvoice.BankAccount}}</el-col>
+          </el-row>
+        </div>
+      </el-card>
+      <el-card class="box-card" style="margin-top: 5px"> <!--v-if="entityList && entityList.length > 0"-->
+        <div slot="header">
+        <span>
+          <span style="font-weight: bold;">
+            金额合计： <font color="red">{{this.formDataInvoice.Amount}} 元</font>
+          </span>
+        </span>
+        </div>
+        <el-table :data="paymentinfoList" size="mini" border style="width: 100%">
+          <!--<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.PayDate) }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-dialog>
     <el-dialog title="审核" :visible.sync="Auditshow">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
@@ -306,6 +371,7 @@
         bigUrl: '',
         Auditshow: false,
         dialogVisible: false,
+        invoiceVisible: false,
         legalPersonImgVisible: false,
         tabindex: '',
         activeName: 'first',
@@ -407,6 +473,18 @@
           LinkZipCode: '',
           HseTraining: ''
         },
+        formDataInvoice: {
+          Id: '',
+          SrcIds: '',
+          IsInvoice: '',
+          SupplierName: '',
+          CommercialNo: '',
+          Address: '',
+          DepositBank: '',
+          BankAccount: '',
+          Amount: ''
+        },
+        paymentinfoList: [],
         entityListtode: [],
         entityListdone: []
       }
@@ -418,6 +496,29 @@
       this.initDatas()
     },
     methods: {
+      confirmIsInvoice () {
+        let params = {
+          Id: this.formDataInvoice.Id,
+          SrcIds: this.formDataInvoice.SrcIds
+        }
+        api.updateIsInvoice(params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            // 关闭dialog
+            this.invoiceVisible = false
+            // 更新列表
+            this.initDatas()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+      },
       initDatas () {
         // 分页及列表条件
         let myCreateOn = []
@@ -506,7 +607,21 @@
             SupplierType = 'techedit'
           }
           this.$router.push('oilsupplier/supplierstorage/' + val.Id + '/' + SupplierType + '?certid=' + val.CertId)
+        } else if (val.Type === '8') {
+          this.initInvoiceDatas(val.Id)
+          this.invoiceVisible = true
+        }
+      },
+      initInvoiceDatas (Id) {
+        let params = {
+          Id: Id
         }
+        api.getInvoiceData(params, this.$axios).then(res => {
+          this.formDataInvoice = res.data.items['invoiceinfo']
+          this.paymentinfoList = res.data.items['paymentinfos']
+        }).catch(err => {
+          console.error(err)
+        })
       },
       bigImg (url) {
         this.bigUrl = url
@@ -712,6 +827,17 @@
             return val
         }
       },
+      transferStr (val) {
+        if (val === '1') {
+          return '准入交费'
+        } else if (val === '2') {
+          return '年审交费'
+        } else if (val === '3') {
+          return '增项交费'
+        } else {
+          return val
+        }
+      },
       timestampToTime (val) {
         var date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
         var Y = date.getFullYear() + '-'
@@ -750,6 +876,14 @@
         minute = minute < 10 ? ('0' + minute) : minute
         return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       },
+      formatDateTimeymd (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
+        return y + '-' + m + '-' + d
+      },
       handleCurrentChangeFinished (value) {
         this.currentPageFinished = value
         this.finishedData()
@@ -781,5 +915,31 @@
      margin-top: 10px;
      margin-right: 40px;
    }
+  .table-layout {
+    margin-top: 20px;
+    border-left: 1px solid #DCDFE6;
+    border-top: 1px solid #DCDFE6;
+  }
+  .table-cell {
+    height: 40px;
+    line-height: 20px;
+    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>

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

@@ -66,6 +66,12 @@
         </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="IsInvoice" label="发票">
+          <template slot-scope="scope">
+            <span v-if="scope.row.IsInvoice=='1'" style="color:#67C23A">已开</span>
+            <span v-if="scope.row.IsInvoice=='0'" style="color:#F56C6C">未开</span>
+          </template>
+        </el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注">
         </el-table-column>
       </el-table>