准入 增项 年审 二级单位分办 业务处室分办 可以退回

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

@@ -973,6 +973,7 @@ func (this *AnnualAuditController) SeparateUnitSubmitAuditEntity() {
 // @router /separate-audit/:id [post]
 func (this *AnnualAuditController) SeparateAuditEntity() {
 	annualId := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
 	// typeCode := this.GetString("TypeCode")
@@ -998,15 +999,17 @@ func (this *AnnualAuditController) SeparateAuditEntity() {
 	srv := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var annualEntity annualaudit.OilAnnualAudit
 	srv.GetEntityById(annualId, &annualEntity)
-	// 将选择的初审和复审人员保存下来
-	cols := []string{
-		"FirstAudit",
-		"SecondAudit",
-		"thirdAudit",
+	if Result == "1" {
+		// 将选择的初审和复审人员保存下来
+		cols := []string{
+			"FirstAudit",
+			"SecondAudit",
+			"thirdAudit",
+		}
+		annualEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+		annualEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+		srv.UpdateEntityByIdCols(annualId, annualEntity, cols)
 	}
-	annualEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	annualEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
-	srv.UpdateEntityByIdCols(annualId, annualEntity, cols)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -1014,7 +1017,7 @@ func (this *AnnualAuditController) SeparateAuditEntity() {
 	ActiComplete.BusinessKey = annualEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id // 审批人员
 	// ActiComplete.UserNames = secondAudit // 初审人员
-	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/infochange.go

@@ -1736,6 +1736,7 @@ func (this *InfoChangeController) UnitAuditEntity() {
 func (this *InfoChangeController) SeparateAuditEntity() {
 	infoId := this.Ctx.Input.Param(":id")
 	//SuppId := this.GetString("SuppId")
+	Result := this.GetString("Result")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
 	AuditRemark := this.GetString("AuditRemark")
@@ -1760,14 +1761,16 @@ func (this *InfoChangeController) SeparateAuditEntity() {
 	infoSrv := infochange.GetInfoChangeService(utils.DBE)
 	var infoChangeEntity infochange.OilInfoChange
 	infoSrv.GetEntityById(infoId, &infoChangeEntity)
-	// 将选择的初审和复审人员保存下来
-	cols := []string{
-		"FirstAudit",
-		"SecondAudit",
+	if Result == "1" {
+		// 将选择的初审和复审人员保存下来
+		cols := []string{
+			"FirstAudit",
+			"SecondAudit",
+		}
+		infoChangeEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+		infoChangeEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+		infoSrv.UpdateEntityByIdCols(infoId, infoChangeEntity, cols)
 	}
-	infoChangeEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	infoChangeEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
-	infoSrv.UpdateEntityByIdCols(infoId, infoChangeEntity, cols)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -1775,7 +1778,7 @@ func (this *InfoChangeController) SeparateAuditEntity() {
 	ActiComplete.BusinessKey = infoChangeEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id // 审批人员
 	// ActiComplete.UserNames = secondAudit // 初审人员
-	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/suppliercert.go

@@ -826,6 +826,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 // @router /separate-audit/:id [post]
 func (this *OilSupplierCertController) SeparateAuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
 	thirdAudit := this.GetString("ThirdAudit")
@@ -852,16 +853,18 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
-	// 将选择的初审和复审人员保存下来
-	cols := []string{
-		"FirstAudit",
-		"SecondAudit",
-		"thirdAudit",
+	if Result == "1" {
+		// 将选择的初审和复审人员保存下来
+		cols := []string{
+			"FirstAudit",
+			"SecondAudit",
+			"thirdAudit",
+		}
+		supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+		supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+		supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit) // 专业处室
+		certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 	}
-	supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
-	supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit) // 专业处室
-	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -869,7 +872,7 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id // 审批人员
 	// ActiComplete.UserNames = secondAudit // 初审人员
-	ActiComplete.Result = "1" //分办完成后只向前走
+	ActiComplete.Result = Result //分办完成后只向前走
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -928,6 +931,7 @@ func (this *OilSupplierCertController) CommonAuditEntity() {
 // @router /business-separate-audit/:id [post]
 func (this *OilSupplierCertController) BusinessOfficeSeparateAuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	ProfessionalAudit := this.GetString("ProfessionalAudit")
 	AuditRemark := this.GetString("AuditRemark")
 
@@ -957,7 +961,7 @@ func (this *OilSupplierCertController) BusinessOfficeSeparateAuditEntity() {
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	ActiComplete.BusinessKey = supplierCertEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id //审批人员
-	ActiComplete.Result = "1"          //前台审批[同意、不同意]
+	ActiComplete.Result = Result          //前台审批[同意、不同意]
 	ActiComplete.UserNames = ProfessionalAudit
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
@@ -965,15 +969,17 @@ func (this *OilSupplierCertController) BusinessOfficeSeparateAuditEntity() {
 	if receiveVal != "true" {
 		panic("工作流异常，请联系管理员！" + receiveVal)
 	}
-	cols := []string{
-		"Id",
-		"Status",
-		"ProfessionalAudit",
+	if Result == "1" {
+		cols := []string{
+			"Id",
+			"Status",
+			"ProfessionalAudit",
+		}
+		supplierCertId := strings.Split(supplierCertEntity.BusinessKey, "-")[0]
+		supplierCertEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
+		supplierCertEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
+		certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 	}
-	supplierCertId := strings.Split(supplierCertEntity.BusinessKey, "-")[0]
-	supplierCertEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
-	supplierCertEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
-	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 }
 
 // @Title 集中审批

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

@@ -864,6 +864,7 @@ func (this *OilSupplierCertAppendController) SeparateUnitSubmitAuditEntity() {
 // @router /separate-audit/:id [post]
 func (this *OilSupplierCertAppendController) AppendSeparateAuditEntity() {
 	certAppendId := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	firstAudit := this.GetString("FirstAudit")
 	secondAudit := this.GetString("SecondAudit")
 	thirdAudit := this.GetString("ThirdAudit")
@@ -890,16 +891,18 @@ func (this *OilSupplierCertAppendController) AppendSeparateAuditEntity() {
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(certAppendId, &supplierCertAppendEntity)
-	// 将选择的初审和复审人员保存下来
-	cols := []string{
-		"FirstAudit",
-		"SecondAudit",
-		"thirdAudit",
+	if Result == "1" {
+		// 将选择的初审和复审人员保存下来
+		cols := []string{
+			"FirstAudit",
+			"SecondAudit",
+			"thirdAudit",
+		}
+		supplierCertAppendEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+		supplierCertAppendEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+		supplierCertAppendEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit) // 专业处室
+		certSrv.UpdateEntityByIdCols(certAppendId, supplierCertAppendEntity, cols)
 	}
-	supplierCertAppendEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	supplierCertAppendEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
-	supplierCertAppendEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit) // 专业处室
-	certSrv.UpdateEntityByIdCols(certAppendId, supplierCertAppendEntity, cols)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
@@ -907,7 +910,7 @@ func (this *OilSupplierCertAppendController) AppendSeparateAuditEntity() {
 	ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id // 审批人员
 	// ActiComplete.UserNames = secondAudit // 初审人员
-	ActiComplete.Result = "1" //分办完成后只向前走
+	ActiComplete.Result = Result //分办完成后只向前走
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -966,6 +969,7 @@ func (this *OilSupplierCertAppendController) AppendCommonAuditEntity() {
 // @router /business-separate-audit/:id [post]
 func (this *OilSupplierCertAppendController) AppendBusinessOfficeSeparateAuditEntity() {
 	certAppendId := this.Ctx.Input.Param(":id")
+	Result := this.GetString("Result")
 	ProfessionalAudit := this.GetString("ProfessionalAudit")
 	AuditRemark := this.GetString("AuditRemark")
 
@@ -995,7 +999,7 @@ func (this *OilSupplierCertAppendController) AppendBusinessOfficeSeparateAuditEn
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
 	ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
 	ActiComplete.UserId = this.User.Id         //审批人员
-	ActiComplete.Result = "1"                  //前台审批[同意、不同意]
+	ActiComplete.Result = Result                  //前台审批[同意、不同意]
 	ActiComplete.UserNames = ProfessionalAudit // 直接分配业务处室专业审批人
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
@@ -1003,15 +1007,17 @@ func (this *OilSupplierCertAppendController) AppendBusinessOfficeSeparateAuditEn
 	if receiveVal != "true" {
 		panic("工作流异常，请联系管理员！" + receiveVal)
 	}
-	cols := []string{
-		"Id",
-		"Status",
-		"ProfessionalAudit",
+	if Result == "1" {
+		cols := []string{
+			"Id",
+			"Status",
+			"ProfessionalAudit",
+		}
+		supplierCertAppendId := strings.Split(supplierCertAppendEntity.BusinessKey, "-")[0]
+		supplierCertAppendEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
+		supplierCertAppendEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
+		certSrv.UpdateEntityByIdCols(supplierCertAppendId, supplierCertAppendEntity, cols)
 	}
-	supplierCertAppendId := strings.Split(supplierCertAppendEntity.BusinessKey, "-")[0]
-	supplierCertAppendEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
-	supplierCertAppendEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
-	certSrv.UpdateEntityByIdCols(supplierCertAppendId, supplierCertAppendEntity, cols)
 }
 
 // @Title 集中审批

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -601,7 +601,13 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -620,14 +626,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1454,13 +1460,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1518,14 +1525,14 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1534,19 +1541,19 @@
           }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true
@@ -1559,14 +1566,31 @@
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -668,7 +668,13 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -706,14 +712,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1383,13 +1389,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1446,14 +1453,14 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1462,19 +1469,19 @@
           }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true
@@ -1680,14 +1687,31 @@
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -585,7 +585,13 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
             default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -604,14 +610,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1485,13 +1491,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1546,14 +1553,14 @@
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1562,19 +1569,19 @@
           }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true
@@ -1587,14 +1594,31 @@
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -34,7 +34,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button><!-- 企业法规处 -->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">入库审批</el-button><!-- 企业法规处 -->
           <el-button type="warning" size="mini" style="margin-left: 8px" @click="backStatus" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">退回</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
@@ -926,14 +926,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1766,42 +1766,42 @@ export default {
             })
             return
           }
-          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '请填写审批意见！'
-          //   })
-          //   return
-          // }
-          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '审批意见不能低于20个字符！'
-          //   })
-          //   return false
-          // }
-        } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          // this.shenheForm.AuditorRemark = this.backRemark
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写退回意见！'
             })
             return false
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         return true
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1809,6 +1809,7 @@ export default {
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -34,7 +34,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">入库审批</el-button>
           <el-button type="warning" size="mini" style="margin-left: 8px" @click="backStatus" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">退回</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && AnnualStatus == '6'">交费</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
@@ -817,14 +817,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -2427,49 +2427,49 @@
             })
             return
           }
-          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '请填写审批意见！'
-          //   })
-          //   return
-          // }
-          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '审批意见不能低于20个字符！'
-          //   })
-          //   return false
-          // }
-        } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写退回意见！'
             })
             return false
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         return true
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -34,7 +34,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">入库审批</el-button>
           <el-button type="warning" size="mini" style="margin-left: 8px" @click="backStatus" v-if="auditBtn && AnnualStatus == '7'" :loading="btnLoading">退回</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">提交</el-button>
+          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="secUnitSeparateAuditClick" v-if="auditBtn && AnnualStatus == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && AnnualStatus == '6'">交费</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
@@ -737,14 +737,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1571,42 +1571,41 @@
             })
             return
           }
-          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '请填写审批意见！'
-          //   })
-          //   return
-          // }
-          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '审批意见不能低于20个字符！'
-          //   })
-          //   return false
-          // }
-        } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写退回意见！'
             })
             return false
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         return true
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
@@ -1614,6 +1613,7 @@
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           AuditRemark: this.shenheForm.AuditorRemark

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

@@ -114,6 +114,8 @@
                   style="color:#F56C6C">复审未通过</span>
             <span v-if="scope.row.Status=='3'"
                   style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='-3'"
+                  style="color:#F56C6C">专业处室分办未通过</span>
             <span v-if="scope.row.Status=='4'"
                   style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-4'"

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

@@ -113,6 +113,8 @@
                   style="color:#F56C6C">复审未通过</span>
             <span v-if="scope.row.Status=='3'"
                   style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='-3'"
+                  style="color:#F56C6C">专业处室分办未通过</span>
             <span v-if="scope.row.Status=='4'"
                   style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-4'"

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

@@ -72,6 +72,7 @@
             <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
             <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
             <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">专业处室分办未通过</span>
             <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>

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

@@ -114,6 +114,8 @@
                   style="color:#F56C6C">复审未通过</span>
             <span v-if="scope.row.Status=='3'"
                   style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='-3'"
+                  style="color:#F56C6C">专业处室分办未通过</span>
             <span v-if="scope.row.Status=='4'"
                   style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-4'"

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

@@ -64,6 +64,7 @@
               <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
               <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">专业处室分办未通过</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>

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

@@ -63,6 +63,7 @@
               <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
               <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">专业处室分办未通过</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>

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

@@ -67,6 +67,7 @@
               <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
               <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">专业处室分办未通过</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>

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

@@ -64,6 +64,7 @@
               <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
               <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">专业处室分办未通过</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>

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

@@ -297,7 +297,13 @@
     </el-dialog>
     <el-dialog title="提交领导审核" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -316,14 +322,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="parseInt(shenheForm.SuccessStatus) === 1">
             <el-form-item label="初审人员">
               <el-select ref="selectAuditer"
@@ -1133,15 +1139,32 @@
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }
@@ -1308,13 +1331,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1367,14 +1391,14 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.auditform.AuditRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1382,20 +1406,20 @@
             return false
           }
         } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          this.auditform.AuditRemark = this.backRemark
+          if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.auditform.AuditRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true

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

@@ -280,7 +280,13 @@
     </el-dialog>
     <el-dialog title="提交领导审核" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
             default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -299,14 +305,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="parseInt(shenheForm.SuccessStatus) === 1">
             <el-form-item label="初审人员">
               <el-select ref="selectAuditer"
@@ -1066,13 +1072,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1125,14 +1132,14 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1140,20 +1147,20 @@
             return false
           }
         } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          this.auditform.AuditRemark = this.backRemark
+          if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.auditform.AuditRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true
@@ -1166,15 +1173,32 @@
         this.dialogBusinessOfficeSeparateAuditVisible = true
       },
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }

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

@@ -297,7 +297,13 @@
     <!--业务处室分办提交-->
     <el-dialog title="提交领导审核" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -317,14 +323,14 @@
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
-          <!--<el-col :span="24">-->
-          <!--  <el-form-item label="审批状态">-->
-          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
-          <!--      <el-radio :label="1">通过</el-radio>-->
-          <!--      <el-radio :label="0">退回</el-radio>-->
-          <!--    </el-radio-group>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" v-if="parseInt(shenheForm.SuccessStatus) === 1">
             <el-form-item label="初审人员">
               <el-select ref="selectAuditer"
@@ -1015,13 +1021,14 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
-        this.shenheForm.SuccessStatus = 1
+        // this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.selectDept,
@@ -1050,7 +1057,6 @@
       },
       // 二级单位分办审批参数检查 ⬇
       secUnitSeparateAuditParamsCheck () {
-        console.log(this.shenheForm.SuccessStatus, '状态1')
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.auditer === '') {
             this.$message({
@@ -1075,14 +1081,14 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.auditform.AuditRemark.trim().length < 20) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -1090,20 +1096,20 @@
             return false
           }
         } else {
-          this.shenheForm.AuditorRemark = this.backRemark
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
+          this.auditform.AuditRemark = this.backRemark
+          if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '请填写退回意见！'
             })
-            return
+            return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          if (this.auditform.AuditRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
-              message: '请填写退回意见！'
+              message: '退回意见不能低于5个字符！'
             })
-            return false
+            return
           }
         }
         return true
@@ -1189,15 +1195,32 @@
       },
       // 业务处室分办提交
       businessOfficeSeparateAuditMakeSure () {
-        if (this.ProfessionalAudit === '') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.ProfessionalAudit === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择审批人！'
+            })
+            return
+          }
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 1) {
+          this.$message({
+            type: 'warning',
+            message: '请填写审批意见！'
+          })
+          return false
+        }
+        if (this.shenheForm.AuditorRemark.trim().length < 5) {
           this.$message({
             type: 'warning',
-            message: '请选择审批人！'
+            message: '审批意见不能低于5个字符！'
           })
           return
         }
         this.loading = true
         let params = {
+          Result: this.shenheForm.SuccessStatus,
           ProfessionalAudit: this.ProfessionalAudit,
           AuditRemark: this.shenheForm.AuditorRemark
         }