年审审批

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

@@ -9,6 +9,17 @@
       <div slot="header" class="clearfix">
         <span>年审基本信息表</span>
         <span style="float: right;">
+          <el-popover>
+            <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填信息"></el-step>
+              <el-step title="待审批"></el-step>
+              <el-step title="已审批"></el-step>
+              <el-step title="待交费"></el-step>
+              <el-step title="待入库"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+          </el-popover>
           <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>
@@ -17,7 +28,7 @@
         </router-link>
         </span>
       </div>
-      <el-tabs tab-position="right" style="margin-top: 10px">
+      <el-tabs tab-position="top" style="margin-top: 10px">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">

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

@@ -9,23 +9,34 @@
       <div slot="header" class="clearfix">
         <span>年审基本信息表</span>
         <span style="float: right;">
+          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
+          <el-popover>
+            <el-steps :active="Step" direction="vertical" align-center finish-status="success">
+              <el-step title="填写信息"></el-step>
+              <el-step title="提交审批"></el-step>
+              <el-step title="审批完成"></el-step>
+              <el-step title="供方交费"></el-step>
+              <el-step title="完成"></el-step>
+            </el-steps>
+            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+          </el-popover>
           <el-button type="primary" size="mini" @click="addshow =true" v-if="Status == '2'">提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit'">
-          <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>
-        </router-link>
+            <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">
+      <!-- <el-steps :active="Step" simple align-center finish-status="success">
         <el-step title="填写信息"></el-step>
         <el-step title="提交审批"></el-step>
         <el-step title="审批完成"></el-step>
         <el-step title="供方交费"></el-step>
         <el-step title="完成"></el-step>
-      </el-steps>
+      </el-steps> -->
 
-      <el-tabs tab-position="right" style="margin-top: 20px">
+      <el-tabs tab-position="top" style="margin-top: 20px" v-model="activeName">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -270,6 +281,7 @@
 
     data() {
       return {
+        activeName: '1',
         orgtreelist: [],
         orgtreeprops: {
           value: 'id',
@@ -400,7 +412,7 @@
           process: 'oil_audit_apply',
           business: '',
           instance: '',
-          Status:''
+          Status: ''
         },
         Status: '',
         rules: {
@@ -455,6 +467,14 @@
           this.SetFormData(fdata)
         }
       },
+      nextTab() {
+        let activeIdx = parseInt(this.activeName)
+        if (activeIdx < 4) {
+          this.activeName = (activeIdx + 1) + ''
+        } else {
+          this.activeName = '1'
+        }
+      },
       SetFormData(fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id