待入库

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

@@ -182,7 +182,7 @@ func (this *OilSupplierCertListenerController) ConcentrateAudit() {
 	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 
 	//查出集中审批的人员
-	stepCode := workflow.PROF_CONCENT //集中审批
+	stepCode := workflow.PROF_REGULATION //集中审批 其实就是企业法规处
 	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
 	approverIds := auditSettingService.GetApproverIdsByStepCodeForConcentrateAudit(stepCode)
 	var approveInfo ListenerApproveInfo
@@ -331,6 +331,60 @@ func (this *OilSupplierCertListenerController) GetPrePayer() {
 	this.ServeJSON()
 }
 
+// @Title 企业法规处入库人员列表 --回调
+// @Description get user by token
+// @Success 200 {string} string
+// @router /pre-storage-audit [post]
+func (this *OilSupplierCertListenerController) GetStorageAuditor() {
+	var jsonBlob = this.Ctx.Input.RequestBody
+	var listenerApprove ListenerApproveParams
+	json.Unmarshal(jsonBlob, &listenerApprove)
+	supplierCertId := strings.Split(listenerApprove.BusinessKey, "-")[0]
+
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var supplierCertEntity suppliercert.OilSupplierCert
+	certSrv.GetEntityById(supplierCertId, &supplierCertEntity)
+	cols := []string{
+		"Id",
+		"Status",
+	}
+	//进入此步骤，记录在数据库中
+	supplierCertEntity.Status = suppliercert.STOREING_STATUS //待入库
+	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
+
+	//查出入库审批的人员
+	stepCode := workflow.PROF_REGULATION //待入库(企业法规处)
+	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
+	approverIds := auditSettingService.GetApproverIdsByStepCodeForConcentrateAudit(stepCode)
+	var approveInfo ListenerApproveInfo
+	approveInfo.Users = approverIds
+	this.Data["json"] = &approveInfo
+	this.ServeJSON()
+}
+
+// @Title 企业法规处审批入库完成, 工作流结束--回调
+// @Description get user by token
+// @Success 200 {string} string
+// @router /workflow-end [get]
+func (this *OilSupplierCertListenerController) WorkflowEndAudit() {
+	businessKey := this.GetString("businessKey")
+	supplierCertId := strings.Split(businessKey, "-")[0]
+	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var supplierCertEntity suppliercert.OilSupplierCert
+	certSrv.GetEntityById(supplierCertId, &supplierCertEntity)
+
+	cols := []string{
+		"Id",
+		"Status",
+	}
+	//进入此步骤，记录在数据库中
+	supplierCertEntity.Status = suppliercert.STORE_STATUS //已入库
+	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
+
+	this.Data["json"] = 1
+	this.ServeJSON()
+}
+
 // @Title 审批驳回--回调
 // @Description get user by token
 // @Success 200 {string} string
@@ -350,7 +404,6 @@ func (this *OilSupplierCertListenerController) ApprovalRefuse() {
 	supplierCertEntity.Status = suppliercert.DRAFT_STATUS //重置为草稿状态
 	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 
-	//创建人即为交费的人员
 	this.Data["json"] = 1
 	this.ServeJSON()
 }

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

@@ -17,7 +17,7 @@
             v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()"
             v-if="auditBtn && this.formData.Status == '3' && this.formData.InStyle != '2'">提交专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()"
             v-if="auditBtn && this.formData.Status == '4' && this.formData.InStyle != '2'">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity('5')"
             v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
@@ -977,15 +977,13 @@
           this.radioChange()
         }
       },
-      // 二级单位——初审会话框
       commonAuditClick () {
-        console.log('审批会话框')
+        console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true
         this.radioChange()
       },
-      // 二级单位————初审结果提交
       commonAuditMakeSure () {
-        console.log('审批结果提交')
+        console.log('审批结果公共提交')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({