准入申请-确认入库按钮兼容退回方法

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -165,6 +165,7 @@ const (
 	NO_THIRD_TRIAL_STATUS  string = "-3"  // 专业处接收未通过
 	NO_PROF_AUDIT_STATUS   string = "-4"  // 专业处室未通过
 	NO_CENT_AUDIT_STATUS   string = "-5"  // 集中评审未通过
+	NO_STOREING_STATUS     string = "-7"  //待入库未通过
 	NO_LAW_AUDIT_STATUS	   string = "9"	  // 企管法规处未通过
 	NO_FEN_TRIAL_STATUS    string = "-10" //二级单位分办未通过
 	ALL_PASE_STATUS        string = "11"  //审核完成

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

@@ -1023,8 +1023,8 @@ func (this *OilSupplierCertController) ConcentrateAuditEntity() {
 // @router /update-is-storage/:id [post]
 func (this *OilSupplierCertController) UpdateIsStorage() {
 	id := this.Ctx.Input.Param(":id")
-	status := this.GetString("Status")
-	PACNumber := this.GetString("PACNumber")
+	result := this.GetString("result")
+	WZAccessCardNo := this.GetString("WZAccessCardNo")
 	SupplierId := this.GetString("SupplierId")
 	var errinfo ErrorInfo
 	if id == "" {
@@ -1053,19 +1053,17 @@ func (this *OilSupplierCertController) UpdateIsStorage() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	certSrv.GetEntityById(id, &supplierCertEntity)
 
-	var supplierEntity supplier.OilSupplier
-	srv := supplier.GetOilSupplierService(utils.DBE)
-	srv.GetEntityById(SupplierId, &supplierEntity)
-	supplierEntity.PACNumber = PACNumber
-	srvCols := []string{"PACNumber"}
-	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
-
 	AuditRemark := ""
-	fmt.Println("审批入库传入状态：", status)
-	if status == "1" {
-		AuditRemark = "审批通过已入库。"
+	if result == "1" {
+		AuditRemark = "审批通过, 已入库。"
+		var supplierEntity supplier.OilSupplier
+		srv := supplier.GetOilSupplierService(utils.DBE)
+		srv.GetEntityById(SupplierId, &supplierEntity)
+		supplierEntity.WZAccessCardNo = WZAccessCardNo
+		srvCols := []string{"WZAccessCardNo"}
+		srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 	} else {
-		AuditRemark = "已入库。"
+		AuditRemark = "待入库未通过。"
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
@@ -1073,7 +1071,7 @@ func (this *OilSupplierCertController) UpdateIsStorage() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = "1" //前台审批[同意、不同意]
+	ActiComplete.Result = result
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)

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

@@ -214,6 +214,37 @@ func (this *OilSupplierCertListenerController) CheckNeedConcentrateAudit() {
 	this.ServeJSON()
 }
 
+// @Title 企业法规处审批人员列表 --回调
+// @Description get user by token
+// @Success 200 {string} string
+// @router /law-office-auditors [post]
+func (this *OilSupplierCertListenerController) GetLawOfficeAuditors() {
+	var jsonBlob = this.Ctx.Input.RequestBody
+	var listenerApprove ListenerApproveParams
+	json.Unmarshal(jsonBlob, &listenerApprove)
+	annualId := strings.Split(listenerApprove.BusinessKey, "-")[0]
+
+	svc := suppliercert.GetOilSupplierCertService(utils.DBE)
+	var certEntity suppliercert.OilSupplierCert
+	svc.GetEntityById(annualId, &certEntity)
+	cols := []string{
+		"Id",
+		"Status",
+	}
+	//进入此步骤，记录在数据库中
+	certEntity.Status = suppliercert.CENT_AUDIT_STATUS //企业法规处
+	svc.UpdateEntityByIdCols(annualId, certEntity, 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

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

@@ -566,7 +566,7 @@
         })
       },
       confirm () {
-        console.log('物资类保单', this.formData)
+        console.log('物资类表单', this.formData)
         if (this.formData.WZAccessCardNo === '') {
           this.$message({
             type: 'warning',
@@ -574,20 +574,6 @@
           })
           return
         }
-        let tepApi = {}
-        if (this.applyType === '1') {
-          tepApi = apiCert
-        } else if (this.applyType === '2') {
-          tepApi = apiCertAppend
-        } else if (this.applyType === '3') {
-          tepApi = apiAnnual
-        } else {
-          this.$message({
-            type: 'warning',
-            message: '审批类型错误！！'
-          })
-          return
-        }
         this.btnLoading = true
         this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
@@ -595,22 +581,23 @@
           type: 'warning'
         }).then(() => {
           let params = {
-            Status: this.formData.Status,
-            PACNumber: this.formData.PACNumber,
+            result: '1',
+            WZAccessCardNo: this.formData.WZAccessCardNo, // 物资类准入编码 确认入库时 自动更新准入编码
             SupplierId: this.formData.Id
           }
-          tepApi.updateIsStorage(this.certId, params, this.$axios).then(res => {
+          let _this = this
+          apiCert.updateIsStorage(this.certId, params, this.$axios).then(res => {
+            // 准入申请更新入库
             if (res.data.code === 0) {
               this.initDatas()
-              if (this.$refs['WfHistory']) {
-                this.$refs['WfHistory'].getHistoryTask()
+              if (_this.$refs['WfHistory']) {
+                _this.$refs['WfHistory'].getHistoryTask()
               }
               console.log('已强制刷新历史审批流程')
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
-              // this.$router.push('/') // TODO 是否跳回首页
             } else {
               this.$message({
                 type: 'warning',