年审按钮及步骤下一步

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

@@ -505,10 +505,12 @@ func (this *OilSupplierCertController) AuditEntity() {
 	certSrv.GetEntityById(certId, supplierCertEntity)
 	supplierCertEntity.WorkflowId = processInstanceId
 	supplierCertEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	supplierCertEntity.Step = 4
 	cols := []string{
 		"Id",
 		"WorkflowId",
 		"Status",
+		"Step",
 	}
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 }

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

@@ -6,16 +6,18 @@
       <el-breadcrumb-item>技术服务类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
-      <!--<div slot="header">
+      <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
+          <el-button type="primary" plain size="mini">年审申请</el-button> <!--v-if="formData.Step>=5"-->
+          <el-button type="primary" plain size="mini">增项申请</el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
-      </div>-->
+      </div>
 
       <el-steps :active="formData.Step" simple align-center finish-status="success">
         <el-step title="企业基本信息"></el-step>
@@ -482,7 +484,7 @@
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" @click="AuditEntity">提交审批
+                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading" @click="AuditEntity">提交审批
                 </el-button>
               </span>
             </div>
@@ -529,8 +531,9 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
+        applyLoading: false,
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
         patentList: [], //拥有专利、专有技术及工法
@@ -782,7 +785,7 @@
         return true
       },
       //企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -806,6 +809,7 @@
       },
 
       AuditEntity() {
+        this.applyLoading = true
         apiCert.auditEntity(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -820,6 +824,8 @@
               message: res.data.message
             });
           }
+          this.applyLoading = false
+
         }).catch(err => {
           console.error(err)
         });

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

@@ -32,13 +32,13 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 246px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/supplier/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
-              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+              <el-button type="primary" plain title="详细信息" size="mini">打开</el-button>
             </router-link>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+            <el-popover placement="top" title="提示">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -49,9 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-                <i class="el-icon-delete"></i>
-              </el-button>
+              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>