信息变更-是否交费

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

@@ -45,7 +45,7 @@ func (this *OilInfoChangeListenerController) PreFenTrialStatus() {
 	infoSrv.UpdateEntityByIdCols(infoId, infoChangeEntity, cols)
 
 	//查出二级单位分办的人员
-	stepCode := workflow.GetWorkFlowStepCode(infoChangeEntity.SupplierTypeCode)
+	stepCode := workflow.SUB_OFFICE_BG
 	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
 	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, infoChangeEntity.CommitComId)
 	var approveInfo ListenerApproveInfo

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

@@ -1611,6 +1611,13 @@ func (this *InfoChangeController) CompanyAuditEntity() {
 	infoChangeEntity.BusinessKey = businessKey
 	infoChangeEntity.WorkFlowId = processInstanceId
 	infoChangeEntity.CommitComId = unitId
+
+	stepCode := workflow.SUB_OFFICE_BG
+	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
+	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, infoChangeEntity.CommitComId)
+	if approverIds == ""{
+		panic("该分办单位未配置审批人")
+	}
 	infoSrv.UpdateEntityByIdCols(infoId, infoChangeEntity, cols)
 
 	var ActiComplete workflow.ActiCompleteVM
@@ -1687,7 +1694,6 @@ func (this *InfoChangeController) UnitAuditEntity() {
 		"Id",
 		"FirstAudit",
 		"SecondAudit",
-		"thirdAudit",
 		"WorkflowId",
 		"BusinessKey",
 		"ProcessKey",
@@ -1751,7 +1757,6 @@ func (this *InfoChangeController) SeparateAuditEntity() {
 	cols := []string{
 		"FirstAudit",
 		"SecondAudit",
-		"thirdAudit",
 	}
 	infoChangeEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
 	infoChangeEntity.SecondAudit, _ = strconv.Atoi(secondAudit)

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

@@ -13,10 +13,10 @@
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditBtn" v-if="auditBtn && InfoStatusBool()">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditBtn" v-if="auditBtn && InfoStatus == '10'">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && InfoStatus == '1'">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && InfoStatus == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && InfoStatus == '5'">审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && InfoStatus == '5'">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && InfoStatus == '7'">入库审批</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && InfoStatus == '6'">交费</el-button>-->
           <!-- <el-button type="primary" size="mini" @click="submitInfoChange" v-if="InfoStatus > 0">审核</el-button> -->
@@ -741,8 +741,8 @@
         </el-row>
       </el-form>
       <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
+        <el-button size="mini" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
       </span>
       <br>
     </el-dialog>
@@ -802,8 +802,8 @@
         </el-row>
       </el-form>
       <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="secUnitSeparateAuditMakeSure()" :loading="btnloading">确 定</el-button>
+        <el-button size="mini" @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="secUnitSeparateAuditMakeSure()" :loading="btnloading">确 定</el-button>
       </span>
       <br>
     </el-dialog>
@@ -1202,7 +1202,7 @@
           SuppId: parseInt(this.SuppId),
           FirstAudit: this.auditer,
           SecondAudit: this.fushenauditer,
-          AuditRemark: this.shenheForm.AuditRemark
+          AuditRemark: this.shenheForm.AuditorRemark
         }
         console.log('二级单位分办审批结果提交参数：', params)
         this.btnloading = true
@@ -1789,11 +1789,12 @@
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.InfoStatus == '5') {
-            this.textplaceholder = ''
+            this.shenheForm.AuditorRemark = '企管法规处审批通过。'
           } else {
             this.textplaceholder = '请填写审核意见'
           }
         } else {
+          this.shenheForm.AuditorRemark = ''
           this.textplaceholder = '退回意见不能少于5个字'
         }
       },