二级单位信息变更

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

@@ -914,7 +914,7 @@ func (this *InfoChangeController) GetAddSupplierList() {
 func (this *InfoChangeController) CommitAuditEntity() {
 	//suppId := this.Ctx.Input.Param(":id")
 	firstAudit := this.GetString("auditer")
-	//fushenauditer := this.GetString("fushenauditer")
+	fushenauditer := this.GetString("fushenauditer")
 	Remark := this.GetString("Remark")
 	InfoId := this.GetString("MInfoId")
 	//取出审批列表
@@ -967,11 +967,15 @@ func (this *InfoChangeController) CommitAuditEntity() {
 		return
 	}
 	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
+	if this.User.IsCompanyUser == 1 {
+		infochangeentity.Status = suppliercert.FEN_TRIAL_STATUS
+	} else {
+		infochangeentity.Status = suppliercert.FIRST_TRIAL_STATUS
+	}
 	infochangeentity.WorkFlowId = processInstanceId
-	infochangeentity.Status = suppliercert.FEN_TRIAL_STATUS //二级单位初审
 	infochangeentity.FenbanAudit, _ = strconv.Atoi(firstAudit)
-	//infochangeentity.FirstAudit, _ = strconv.Atoi(firstAudit)
-	//infochangeentity.SecondAudit, _ = strconv.Atoi(fushenauditer)
+	infochangeentity.FirstAudit, _ = strconv.Atoi(firstAudit)
+	infochangeentity.SecondAudit, _ = strconv.Atoi(fushenauditer)
 	infochangeentity.AuditIndex = infochangeentity.AuditIndex + 1
 	infochangeentity.BusinessKey = ActiComplete.BusinessKey
 	infochangeentity.CreateOn = time.Now()
@@ -983,8 +987,8 @@ func (this *InfoChangeController) CommitAuditEntity() {
 		"Status",
 		"Step",
 		"FenbanAudit",
-		//"FirstAudit",
-		//"SecondAudit",
+		"FirstAudit",
+		"SecondAudit",
 		"AuditIndex",
 		"BusinessKey",
 		"CreateOn",

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

@@ -18,7 +18,10 @@
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="submitInfoChange"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && !butnab">提交分办
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+          </el-button>
+          <el-button type="primary" size="mini" @click="submitApplyBtn"
+                     v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && authUser.Profile.IsCompanyUser == 0 ">提交申请
           </el-button>
           <router-link :to="'/oilsupplier/infochangech'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -2027,6 +2030,9 @@
         // this.commitshow = true
         this.ComAuditdialogShow = true
       },
+      submitApplyBtn () {
+        this.commitshow = true
+      },
       addInfoChangeAudit() {
         if (this.auditer === "") {
           this.$message({