审核状态

src/dashoo.cn/backend/api/business/codecsequence/codecsequenceService.go

@@ -3,10 +3,10 @@ package codecsequence
 import (
 	"fmt"
 	"strconv"
+	"time"
 
 	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
-	"time"
 )
 
 type CodecSequenceService struct {
@@ -19,340 +19,31 @@ func GetCodecSequenceService(xormEngine *xorm.Engine) *CodecSequenceService {
 	return s
 }
 
-//获得某节点的所有子节点（包括自身）
+
 func (s *CodecSequenceService) GetSequenceByName(accCode, seqName string) int {
 	seq := new(SequenceValue)
 	s.DBE.Sql(`select fun_getCodecSequence ('` + accCode + `','` + seqName + `') as Sequence`).Get(seq)
 	return seq.Sequence
 }
 
-//阻火器报告
-func (s *CodecSequenceService) GetReportZuhqSequence(accCode string) string {
-	seqName := "ZuhqReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q02.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//阻火器数据录入
-func (s *CodecSequenceService) GetDetailZuhqSequence(accCode string) string {
-	seqName := "ZuhqDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q02.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//呼吸阀--报告编码
-func (s *CodecSequenceService) GetReportHuxfSequence(accCode string) string {
-	seqName := "HuxfReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q02.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//呼吸阀--数据录入
-func (s *CodecSequenceService) GetDetailHuxfSequence(accCode string) string {
-	seqName := "HuxfDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q02.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//防雷装置报告
-func (s *CodecSequenceService) GetReportLightProtectSequence(accCode string) string {
-	seqName := "LightProtect"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q3-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-
-	return seqStr
-}
-
-//防雷装置--数据录入
-func (s *CodecSequenceService) GetDetailLightProtectSequence(accCode string) string {
-	seqName := "LightProtectDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q3.01-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-
-	return seqStr
-}
-//防雷装置（等电位）报告
-func (s *CodecSequenceService) GetReportEquipotentSequence(accCode string) string {
-	seqName := "Equipotent"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q9-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//防雷装置（等电位）数据录入
-func (s *CodecSequenceService) GetDetailEquipotentSequence(accCode string) string {
-	seqName := "EquipotentDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特 Q9.01-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//电气接地装置报告
-func (s *CodecSequenceService) GetReportElecGroundSequence(accCode string) string {
-	seqName := "ElecGround"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q5-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//电气接地装置--数据录入编码
-func (s *CodecSequenceService) GetDetailElecGroundSequence(accCode string) string {
-	seqName := "ElecDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q5.01-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//电流表检测报告
-func (s *CodecSequenceService) GetReportAmmeterSequence(accCode string) string {
-	seqName := "AmmeterReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q6-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//电流表数据录入
-func (s *CodecSequenceService) GetDetailAmmeterSequence(accCode string) string {
-	seqName := "AmmeterDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q6.01-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//空气泡沫
-func (s *CodecSequenceService) GetReportKqpmSequence(accCode string) string {
-	seqName := "AirFoam"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q04.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//空气泡沫--数据录入
-func (s *CodecSequenceService) GetDetailKqpmSequence(accCode string) string {
-	seqName := "AirFoamDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q04.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//液压安全阀--报告编号
-func (s *CodecSequenceService) GetReportYyaqfSequence(accCode string) string {
-	seqName := "YyaqfReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q03.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//液压安全阀--检测记录的编号
-func (s *CodecSequenceService) GetDetailYyaqfSequence(accCode string) string {
-	seqName := "YyaqfDetail"
+//物质类
+func (s *CodecSequenceService) GetWZAccessCardNo(accCode string) string {
+	seqName := "WZ"
 	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q03.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	seqStr := strconv.Itoa(time.Now().Year()) + "WZ" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
 }
-
-//游梁式抽油机 报告
-func (s *CodecSequenceService) GetReportBeamPumpingUnitsSequence(accCode string) string {
-	seqName := "BeamPumpingUnitsReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q05.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//游梁式抽油机 数据录入
-func (s *CodecSequenceService) GetDetailBeamPumpingUnitsSequence(accCode string) string {
-	seqName := "BeamPumpingUnitsDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q05.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//漏电保护器报告
-func (s *CodecSequenceService) GetReportLeakProtectSequence(accCode string) string {
-	seqName := "LeakProtectReport"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q2-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//漏电保护器--数据录入
-func (s *CodecSequenceService) GetDetailLeakProtectSequence(accCode string) string {
-	seqName := "LeakProtectDetail"
+//技术服务类
+func (s *CodecSequenceService) GetJFAccessCardNo(accCode string) string {
+	seqName := "JF"
 	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J特Q2-"+ strconv.Itoa( time.Now().Year() ) +"-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	seqStr := strconv.Itoa(time.Now().Year()) + "JF" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
 }
-//无游梁式抽油机
-func (s *CodecSequenceService) GetReportNoBeamPumpingUnitsSequence(accCode string) string {
-	seqName := "NoBeamPumpingUnitsReport"
+//基建类
+func (s *CodecSequenceService) GetJSAccessCardNo(accCode string) string {
+	seqName := "JS"
 	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q06.02-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	seqStr := strconv.Itoa(time.Now().Year()) + "JS" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
 	return seqStr
 }
-//无游梁式抽油机
-func (s *CodecSequenceService) GetDetailNoBeamPumpingUnitsSequence(accCode string) string {
-	seqName := "NoBeamPumpingUnitsDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J宇Q06.01-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//超声校准记录
-func (s *CodecSequenceService) GetDetailUltrasonicCalibrationSequence(accCode string) string {
-	seqName := "UltrasonicCalibrationDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QL5.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//电接点压力表校准记录
-func (s *CodecSequenceService) GetDetailElectricContactsPressureGaugeAdjustSequence(accCode string) string {
-	seqName := "ElectricContactsPressureGaugeAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计 -" + strconv.Itoa( time.Now().Year() ) + "-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//电子天平校准记录
-func (s *CodecSequenceService) GetDetailElectronicBalanceAdjustSequence(accCode string) string {
-	seqName := "ElectronicBalanceAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX8.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//砝码校准记录
-func (s *CodecSequenceService) GetDetailWeightsAdjustSequence(accCode string) string {
-	seqName := "WeightsAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX6.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//贵金属热电偶校准记录
-func (s *CodecSequenceService) GetDetailPreciousMetalThermocoupleAdjustSequence(accCode string) string {
-	seqName := "PreciousMetalThermocoupleAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX13.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//精密压力表校准记录
-func (s *CodecSequenceService) GetDetailPrecisionPressureGaugeAdjustSequence(accCode string) string {
-	seqName := "PrecisionPressureGaugeAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计 -" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//可燃气体检测报警器校准记录
-func (s *CodecSequenceService) GetDetailFlammableGasDetectionAlarmAdjustSequence(accCode string) string {
-	seqName := "FlammableGasDetectionAlarmAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QWX2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//立式罐测量校准记录表二
-func (s *CodecSequenceService) GetDetailVerticalTankMeasurementAdjustSequence(accCode string) string {
-	seqName := "VerticalTankMeasurementAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J 计 QLX7.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//廉金属热电偶校准记录
-func (s *CodecSequenceService) GetDetailCheapMetalThermocoupleAdjustSequence(accCode string) string {
-	seqName := "CheapMetalThermocoupleAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX4.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//硫化氢气体检测仪校准记录
-func (s *CodecSequenceService) GetDetailHydrogenSulfideGasDetectorAdjustSequence(accCode string) string {
-	seqName := "HydrogenSulfideGasDetectorAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QWX2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//热电阻校准记录
-func (s *CodecSequenceService) GetDetailHotResistanceAdjustSequence(accCode string) string {
-	seqName := "HotResistanceAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX5.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//温度变送器校准记录
-func (s *CodecSequenceService) GetDetailTemperatureTransmitterAdjustSequence(accCode string) string {
-	seqName := "TemperatureTransmitterAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//温度计校准记录
-func (s *CodecSequenceService) GetDetailThermometerAdjustSequence(accCode string) string {
-	seqName := "ThermometerAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QRX3.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//涡街校准记录
-func (s *CodecSequenceService) GetDetailVortexStreetAdjustSequence(accCode string) string {
-	seqName := "VortexStreetAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QL3.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//涡轮校准记录
-func (s *CodecSequenceService) GetDetailTurbineAdjustSequence(accCode string) string {
-	seqName := "TurbineAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QL2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//旋进校准记录
-func (s *CodecSequenceService) GetDetailPrecessionAdjustSequence(accCode string) string {
-	seqName := "PrecessionAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QL1.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//压力变送器校准记录
-func (s *CodecSequenceService) GetDetailPressureTransmitterAdjustSequence(accCode string) string {
-	seqName := "PressureTransmitterAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计 -" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//压力表校准记录
-func (s *CodecSequenceService) GetDetailPressureTableAdjustSequence(accCode string) string {
-	seqName := "PressureTableAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计 -" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-
-//腰轮校准记录
-func (s *CodecSequenceService) GetDetailWaistWheelAdjustSequence(accCode string) string {
-	seqName := "WaistWheelAdjustDetail"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QL4.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//钢卷尺检定
-func (s *CodecSequenceService)GetDetailSteelTapeTestSequence(accCode string) string{
-	seqName := "SteelTapeTest"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QY1.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}
-//压力表检定
-func (s *CodecSequenceService)GetDetailPressureGaugTestSequence(accCode string) string{
-	seqName := "PressureGaugTest"
-	sequence := s.GetSequenceByName(accCode, seqName)
-	seqStr := "J计QY2.1-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
-	return seqStr
-}

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

@@ -44,7 +44,7 @@ type OilSupplier struct {
 	LegalPerson        string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
 	CategoryCode       string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
 	CategoryName       string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
-	RegCapital         float32   `xorm:"default 0 comment('注册资本') FLOAT"`
+	RegCapital         float64   `xorm:"default 0 comment('注册资本') FLOAT"`
 	Currency           string    `xorm:"comment('币种') VARCHAR(10)"`
 	ContactName        string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
 	CompanyType        string    `xorm:"comment('公司类型') VARCHAR(20)"`

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/audithistory"
+	"dashoo.cn/backend/api/business/codecsequence"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	"encoding/json"
 	"fmt"
@@ -742,10 +743,12 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	//remarks := ""
 	step := 2
 	status := ""
+	backstatus := "0"
 	var userIds string
 	if supplierCertEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = auditer
 		status = suppliercert.SECOND_TRIAL_STATUS
+		backstatus = "-1"
 		step = 2
 		supplierCertEntity.ThirdAudit,_ = strconv.Atoi(majorDept)
 		cols := []string{
@@ -755,6 +758,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	} else if supplierCertEntity.Status == suppliercert.SECOND_TRIAL_STATUS {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
+		backstatus = "-2"
 		//获得有专业审核接收权限的人员
 		//var users1 []userRole.Base_RoleList
 		//var auditWorkflow1 auditsetting.Base_OilAuditSetting
@@ -777,9 +781,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		userIds = auditer
 		status = suppliercert.PROF_AUDIT_STATUS
 		step = 2
+		backstatus = "-3"
 	} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS {
 		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
+		backstatus = "-4"
 		////获得有专业审核接收权限的人员
 		//var users1 []userRole.Base_RoleList
 		//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
@@ -800,6 +806,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		userIds = auditer
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
+		backstatus = "-5"
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
@@ -822,7 +829,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				"Step",
 			}
 			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-			if supplierCertEntity.Status == "5" {
+			if supplierCertEntity.Status == suppliercert.PAYING_AUDIT_STATUS {//PAYING_AUDIT_STATUS {
 				paysvc := paymentinfo.GetPaymentService(utils.DBE)
 				var Amount float64
 				if supplierCertEntity.SupplierTypeCode == "01" {
@@ -868,7 +875,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
 				supplierCertEntity.Status = suppliercert.NOPASS_STATUS
 			} else {
-				supplierCertEntity.Status = suppliercert.DRAFT_STATUS
+				supplierCertEntity.Status = backstatus
 			}
 			supplierCertEntity.Step = 1
 			supplierCertEntity.WorkflowId = ""
@@ -953,4 +960,50 @@ func (this *OilSupplierCertController) IsAccess() {
 
 	this.Data["json"] = res
 	this.ServeJSON()
+}
+
+// @Title 获取准入编码
+// @Description 获取准入编码
+// @Success 200 {object} controllers.Request
+// @router /createaccesscardno/:type [get]
+func (this *OilSupplierCertController) CreateAccessCardNo() {
+	typeCode := this.Ctx.Input.Param(":type")
+	codecSvc := codecsequence.GetCodecSequenceService(utils.DBE)
+	var model []suppliercert.OilSupplierCert
+	where := "SupplierTypeCode = '" + typeCode + "'"
+	codecSvc.GetEntities(&model, where)
+	seqStr := ""
+	if (typeCode == "01") {
+		seqStr = codecSvc.GetWZAccessCardNo(this.User.AccCode)
+		if model != nil {
+			for i := 0; i < len(model); i++ {
+				if seqStr == model[i].AccessCardNo {
+					seqStr = codecSvc.GetWZAccessCardNo(this.User.AccCode)
+					i = 0
+				}
+			}
+		}
+	} else if typeCode == "03" {
+		seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
+		if model != nil {
+			for i := 0; i < len(model); i++ {
+				if seqStr == model[i].AccessCardNo {
+					seqStr = codecSvc.GetJSAccessCardNo(this.User.AccCode)
+					i = 0
+				}
+			}
+		}
+	} else if typeCode == "02" {
+		seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
+		if model != nil {
+			for i := 0; i < len(model); i++ {
+				if seqStr == model[i].AccessCardNo {
+					seqStr = codecSvc.GetJFAccessCardNo(this.User.AccCode)
+					i = 0
+				}
+			}
+		}
+	}
+	this.Data["json"] = seqStr
+	this.ServeJSON()
 }

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

@@ -85,5 +85,11 @@ export default {
       url: '/suppliercert/isaccess?auditstepcode=' + auditstepcode,
       method: 'get'
     })
+  },
+  createAccessCardNo (type, myAxios) {
+    return myAxios({
+      url: '/suppliercert/createaccesscardno/' + type,
+      method: 'GET'
+    })
   }
 }

src/dashoo.cn/frontend_web/src/components/oilsupplier/winninglist.vue

@@ -97,6 +97,7 @@
           Id: '',
           SupplierCertId: '',
           SupplierTypeCode: '',
+          AwardName: '',
           Authorities: '',
           OwnerUnit: '',
           WinningTime: new Date(),

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -53,7 +53,7 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status == 0">保存基本信息
+                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status <= 0">保存基本信息
                 </el-button>
               </span>
             </div>
@@ -68,7 +68,7 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status == 0">
+                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status <= 0">
                   保存人员结构情况</el-button>
               </span>
             </div>
@@ -152,7 +152,7 @@
             <div slot="header" class="clearfix">
               <span>企业主要装备情况</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <equipment-list ref="equipmentList" :data.sync="equipmentList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
@@ -162,7 +162,7 @@
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></performance-list>
@@ -182,7 +182,7 @@
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -606,7 +606,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status != 0) {
+            if (this.formData.Status > 0) {
               this.add_flat = false
             }
             this.$refs['BasisInfo'].CityAry = []

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -67,12 +67,8 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
               <span style="float: right;">
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click="saveEntity"
-                  v-if="formDataCert.Status == 0"
-                >保存基本信息</el-button>
+                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status <= 0">保存基本信息
+                </el-button>
               </span>
             </div>
             <goods-info
@@ -92,12 +88,8 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click="updateNumberEntity"
-                  v-if="formDataCert.Status == 0"
-                >保存人员结构情况</el-button>
+                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status <= 0">
+                  保存人员结构情况</el-button>
               </span>
             </div>
 
@@ -219,12 +211,8 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要装备情况</span>
-              <el-button
-                style="float: right; padding: 3px 0"
-                type="text"
-                @click="equipmentdialog"
-                v-if="formDataCert.Status == 0"
-              >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <equipment-list
               ref="equipmentList"
@@ -240,12 +228,8 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
-              <el-button
-                style="float: right; padding: 3px 0"
-                type="text"
-                @click="performancedialog"
-                v-if="formDataCert.Status == 0"
-              >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <performance-list
               ref="performanceList"
@@ -260,12 +244,8 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>拥有专利、专有技术及工法</span>
-              <el-button
-                style="float: right; padding: 3px 0"
-                type="text"
-                @click="patentdialog"
-                v-if="formDataCert.Status == 0"
-              >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <patent-list
               ref="patentList"
@@ -281,12 +261,8 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
-              <el-button
-                style="float: right; padding: 3px 0"
-                type="text"
-                @click="winningdialog"
-                v-if="formDataCert.Status == 0"
-              >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <winning-list
               ref="winningList"
@@ -741,7 +717,7 @@ export default {
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal;
             this.formDataCert.Status = this.formData.Status;
             this.formDataCert.WorkflowId = this.formData.WorkflowId;
-            if (this.formData.Status != 0) {
+            if (this.formData.Status > 0) {
               this.add_flat = false;
             }
             this.$refs["GoodsInfo"].CityAry = [];

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -54,7 +54,7 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status == 0">保存基本信息
+                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status <= 0">保存基本信息
                 </el-button>
               </span>
             </div>
@@ -69,7 +69,7 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status == 0">
+                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status <= 0">
                   保存人员结构情况</el-button>
               </span>
             </div>
@@ -163,7 +163,7 @@
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></performance-list>
@@ -173,7 +173,7 @@
             <div slot="header" class="clearfix">
               <span>拥有专利、专有技术及工法</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <patent-list ref="patentList" :data.sync="patentList" :SupplierCertId="certId+''" :SupplierTypeCode="classId"
               :canadd="add_flat" height="360px" style="margin-top: 20px"></patent-list>
@@ -183,7 +183,7 @@
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
+                v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
             <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -572,6 +572,7 @@
       isCanUpdateSupplier(supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
+          console.log(this.canUpdateSupplier, 'this.canUpdateSupplier')
         }).catch(err => {
           console.error(err)
         })
@@ -605,7 +606,7 @@
             this.formDataCert.DesignerTotal = this.formData.DesignerTotal
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
-            if (this.formData.Status != 0) {
+            if (this.formData.Status > 0) {
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -54,6 +54,50 @@
           </template>
         </el-table-column>
 
+        <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='0' || scope.row.Status==''" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待提交" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="初审未通过" type="error">
+            </el-alert>
+            <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=='-2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :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="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=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="集中评审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待缴费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="已入库" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
+
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -53,7 +53,50 @@
             </el-popover>
           </template>
         </el-table-column>
-
+        <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='0' || scope.row.Status==''" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待提交" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="初审未通过" type="error">
+            </el-alert>
+            <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=='-2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :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="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=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="集中评审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待缴费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="已入库" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -54,6 +54,50 @@
           </template>
         </el-table-column>
 
+        <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='0' || scope.row.Status==''" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待提交" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="初审未通过" type="error">
+            </el-alert>
+            <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=='-2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :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="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=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="集中评审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待缴费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="已入库" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
+
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -210,8 +210,8 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -227,8 +227,8 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"></el-input>
         </el-form-item>
         <el-divider></el-divider>
         <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
@@ -748,6 +748,13 @@
       },
       // 审核通过
       makeSure() {
+        if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+          this.$message({
+            type: 'warning',
+            message: '审批意见不能低于20个字符！'
+          })
+          return
+        }
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '1' && this.majorDept.length === 0) {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -215,8 +215,8 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item porp="AuditorRemark" label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）" minlength="20"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -233,8 +233,10 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item prop="AuditorRemark" label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"
+                    minlength="20"
+          ></el-input>
         </el-form-item>
 
         <el-divider></el-divider>
@@ -372,7 +374,7 @@
         aduitlabel: '审核人',
         auditTitle: '审批',
         auditBtn: false,
-        companyid:'',
+        companyid: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
@@ -785,6 +787,13 @@
       },
       // 审核通过
       makeSure () {
+        if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+          this.$message({
+            type: 'warning',
+            message: '审批意见不能低于20个字符！'
+          })
+          return
+        }
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '1' && this.majorDept.length === 0) {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -193,8 +193,8 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见" required>
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"></el-input>
         </el-form-item>
         <el-divider></el-divider>
         <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
@@ -210,7 +210,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        
+
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
@@ -225,8 +225,8 @@
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）"></el-input>
         </el-form-item>
         <el-divider></el-divider>
         <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
@@ -537,13 +537,13 @@
               this.auditTitle = '集中审批'
               this.auditstepcode = 'PROF_REGULATION'
             }
-            
+
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            
+
             this.isAccess()
           }).catch(err => {
             console.error(err)
@@ -566,7 +566,7 @@
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
-          
+
           //this.auditerOptions = res.data.items['Auditer']
           //this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
@@ -748,7 +748,14 @@
         this.dialogAllocation = true
       },
       // 审核通过
-      makeSure() {
+      makeSure () {
+        if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+          this.$message({
+            type: 'warning',
+            message: '审批意见不能低于20个字符！'
+          })
+          return
+        }
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.formData.Status === '1' && this.majorDept.length === 0) {
             this.$message({

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

@@ -54,7 +54,49 @@
             </el-popover>-->
           </template>
         </el-table-column>
-
+        <el-table-column min-width="110" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='0' || scope.row.Status==''" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待提交" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待初审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="初审未通过" type="error">
+            </el-alert>
+            <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=='-2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="复审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :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="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=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待集中评审" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='-5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="集中评审未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待缴费" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="待入库" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="已入库" type="success">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>