完成上一步，下一步

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

@@ -5,13 +5,19 @@
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier/basislist' }">基建类供方准入评审表</el-breadcrumb-item>
       <el-breadcrumb-item>基建类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
+
+    <float-img-btn ref="floatBtn" text="下一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.8" @onFloatBtnClicked="nextTab">
+    </float-img-btn>
+    <float-img-btn ref="floatBtn" text="上一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.85" @onFloatBtnClicked="backTab">
+    </float-img-btn>
+
     <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
+          <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
           <el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
@@ -287,10 +293,12 @@
   import BasisInfo from '@/components/oilsupplier/basisinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import FloatImgBtn from '@/components/floatButton/index'
 
   export default {
 
     components: {
+      FloatImgBtn,
       SupplierFileTable,
       WfHistory,
       WfBackHistory,
@@ -648,14 +656,42 @@
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
       nextTab () {
+        let totalTab = 4
+        if (this.formDataCert.Status > 0) {
+          totalTab = 6
+        }
+        let valid = true
+        debugger
+        if (this.formDataCert.Status <= 0 && this.activeName === '0') {
+          valid = this.saveEntity()
+        } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
+          this.updateNumberEntity()
+        }
+        if (!valid) {
+          return false
+        }
         let activeIdx = parseInt(this.activeName)
-        if (activeIdx < 4) {
+        if (activeIdx < totalTab) {
           this.activeName = (activeIdx + 1) + ''
         } else {
           this.activeName = '1'
         }
       },
 
+      backTab () {
+        let totalTab = 4
+        if (this.formDataCert.Status > 0) {
+          totalTab = 6
+        }
+
+        let activeIdx = parseInt(this.activeName)
+        if (activeIdx > 0) {
+          this.activeName = (activeIdx - 1) + ''
+        } else {
+          this.activeName = totalTab + ''
+        }
+      },
+
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items

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

@@ -5,19 +5,25 @@
       <el-breadcrumb-item :to="{ path: '/oilsupplier/supplier/goodslist' }">物资类列表</el-breadcrumb-item>
       <el-breadcrumb-item>物资类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
+
+    <float-img-btn ref="floatBtn" text="下一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.8" @onFloatBtnClicked="nextTab">
+    </float-img-btn>
+    <float-img-btn ref="floatBtn" text="上一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.85" @onFloatBtnClicked="backTab">
+    </float-img-btn>
+
     <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button
+          <!--<el-button
             plain
             icon="el-icon-right"
             size="mini"
             style="margin-right: 5px"
             @click="nextTab"
-          >下一步</el-button>
+          >下一步</el-button>-->
           <el-popover>
             <el-steps
               :active="formData.Step"
@@ -386,10 +392,11 @@ import SubfileList from "@/components/oilsupplier/subfilelist";
 import GoodsInfo from "@/components/oilsupplier/goodsinfo";
 
 import ChooseAuditor from "@/components/oilsupplier/chooseauditor";
+import FloatImgBtn from '@/components/floatButton/index'
 
 export default {
   components: {
-    chooseAuditorVisible: false,
+    FloatImgBtn,
     SupplierFileTable,
     WfHistory,
     WfBackHistory,
@@ -414,6 +421,7 @@ export default {
 
   data() {
     return {
+      chooseAuditorVisible: false,
       createBtn: false,
       activeName: "0",
       chooseAuditorVisible: false,
@@ -798,12 +806,39 @@ export default {
         this.certId
       );
     },
-    nextTab() {
-      let activeIdx = parseInt(this.activeName);
-      if (activeIdx < 4) {
-        this.activeName = activeIdx + 1 + "";
+    nextTab () {
+      let totalTab = 4
+      if (this.formDataCert.Status > 0) {
+        totalTab = 6
+      }
+      let valid = true
+      if (this.formDataCert.Status <= 0 && this.activeName === '0') {
+        valid = this.saveEntity()
+      } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
+        this.updateNumberEntity()
+      }
+      if (!valid) {
+        return false
+      }
+      let activeIdx = parseInt(this.activeName)
+      if (activeIdx < totalTab) {
+        this.activeName = (activeIdx + 1) + ''
+      } else {
+        this.activeName = '1'
+      }
+    },
+
+    backTab () {
+      let totalTab = 4
+      if (this.formDataCert.Status > 0) {
+        totalTab = 6
+      }
+
+      let activeIdx = parseInt(this.activeName)
+      if (activeIdx > 0) {
+        this.activeName = (activeIdx - 1) + ''
       } else {
-        this.activeName = "1";
+        this.activeName = totalTab + ''
       }
     },
 

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

@@ -293,12 +293,10 @@
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import FloatImgBtn from '@/components/floatButton/index'
-  import ElIcon from "../../../../../node_modules/element-ui/packages/icon/src/icon";
 
   export default {
 
     components: {
-      ElIcon,
       FloatImgBtn,
       SupplierFileTable,
       WfHistory,
@@ -322,7 +320,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         activeName: '1',
         chooseAuditorVisible: false,
@@ -361,7 +359,7 @@
         formData: {
           Id: '',
           SupplierName: '',
-          CredentialFlag:'1',
+          CredentialFlag: '1',
           OilCertificateNo: '',
           Grade: '',
           MgrUnit: '',
@@ -709,9 +707,9 @@
           totalTab = 6
         }
         let valid = true
-        if (this.formDataCert.Status <= 0 && this.activeName === '1') {
+        if (this.formDataCert.Status <= 0 && this.activeName === '0') {
           valid = this.saveEntity()
-        } else if (this.formDataCert.Status <= 0 && this.activeName === '2') {
+        } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
           this.updateNumberEntity()
         }
         if (!valid) {