年审修改

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

@@ -453,7 +453,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		ActiComplete.UserNames = userIds
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "1"
-		ActiComplete.Remarks = "提交给业务处接收人"
+		ActiComplete.Remarks = dataother.AuditorRemark
 		ActiComplete.CallbackUrl = ""
 		//提交给二级单位初审
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -491,7 +491,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		ActiComplete.UserNames = ""
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "0"
-		ActiComplete.Remarks = "初审未通过"
+		ActiComplete.Remarks = dataother.AuditorRemark
 		ActiComplete.CallbackUrl = ""
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		var auditmodel annualaudit.OilAnnualAudit
@@ -527,7 +527,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		ActiComplete.UserNames = ProfAudit
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "1"
-		ActiComplete.Remarks = "提交给业务处专业审核人"
+		ActiComplete.Remarks = dataother.AuditorRemark
 		ActiComplete.CallbackUrl = ""
 		//提交给业务处室专业审核
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -564,7 +564,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		ActiComplete.UserNames = ""
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "1"
-		ActiComplete.Remarks = "业务处室审核通过"
+		ActiComplete.Remarks = dataother.AuditorRemark
 		ActiComplete.CallbackUrl = ""
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		var auditmodel annualaudit.OilAnnualAudit
@@ -612,7 +612,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		ActiComplete.UserNames = ""
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "0"
-		ActiComplete.Remarks = "业务处室审核未通过"
+		ActiComplete.Remarks = dataother.AuditorRemark
 		ActiComplete.CallbackUrl = ""
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		var auditmodel annualaudit.OilAnnualAudit

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

@@ -12,10 +12,10 @@
           <el-button type="primary" size="mini" @click="annualAudit()" v-if="AnnualStatus == 0 ||AnnualStatus == 3">审核
           </el-button>
           <el-button type="primary" size="mini" @click="profAudit()" v-if="AnnualStatus == 1">专业审核分配</el-button>
-        </span>
-        <router-link :to="'/oilsupplier/annualaudit/annualfistaudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px;float: right;">返回</el-button>
+          <router-link :to="'/oilsupplier/annualaudit/annualfistaudit'">
+            <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
         </router-link>
+        </span>
       </div>
       <el-tabs tab-position="right" style="margin-top: 10px">
         <el-tab-pane label="企业信息">

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

@@ -10,10 +10,11 @@
         <span>年审基本信息表</span>
         <span style="float: right;">
           <el-button type="primary" size="mini" @click="addshow =true" v-if="Status == '2'">提交审核</el-button>
-        </span>
-        <router-link :to="'/oilsupplier/annualaudit'">
-          <el-button type="primary" size="mini" style="margin-left: 8px;float: right;">返回</el-button>
+          <router-link :to="'/oilsupplier/annualaudit'">
+          <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
         </router-link>
+        </span>
+        
       </div>
 
       <el-steps :active="Step" simple align-center finish-status="success">