documnet fixBUG

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

@@ -8,7 +8,7 @@
 
     <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 ref="floatBtn" text="上一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.85" @onFloatBtnClicked="backTab" v-if="certId">
     </float-img-btn>
 
     <el-card class="box-card">
@@ -656,10 +656,17 @@
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
       nextTab () {
-        let totalTab = 4
+        let totalTab = 3
+        if (this.formData.AuditIndex > 0) {
+          totalTab = 4
+        }
         if (this.formDataCert.Status > 0) {
+          totalTab = 5
+        }
+        if (this.formDataCert.Status >= 5) {
           totalTab = 6
         }
+
         let valid = true
         if (this.formDataCert.Status <= 0 && this.activeName === '0') {
           valid = this.saveEntity()
@@ -673,13 +680,19 @@
         if (activeIdx < totalTab) {
           this.activeName = (activeIdx + 1) + ''
         } else {
-          this.activeName = '1'
+          this.activeName = '0'
         }
       },
 
       backTab () {
-        let totalTab = 4
+        let totalTab = 3
+        if (this.formData.AuditIndex > 0) {
+          totalTab = 4
+        }
         if (this.formDataCert.Status > 0) {
+          totalTab = 5
+        }
+        if (this.formDataCert.Status >= 5) {
           totalTab = 6
         }
 
@@ -765,6 +778,7 @@
           } else {
             this.updateEntity()
           }
+          return true
         } else {
           return false
         }

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

@@ -8,7 +8,7 @@
 
     <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 ref="floatBtn" text="上一步" :itemWidth="58" :itemHeight="30" :coefficientHeight="0.85" @onFloatBtnClicked="backTab"  v-if="certId">
     </float-img-btn>
 
     <el-card class="box-card">
@@ -807,8 +807,14 @@ export default {
       );
     },
     nextTab () {
-      let totalTab = 4
+      let totalTab = 3
+      if (this.formData.AuditIndex > 0) {
+        totalTab = 4
+      }
       if (this.formDataCert.Status > 0) {
+        totalTab = 5
+      }
+      if (this.formDataCert.Status >= 5) {
         totalTab = 6
       }
       let valid = true
@@ -824,13 +830,19 @@ export default {
       if (activeIdx < totalTab) {
         this.activeName = (activeIdx + 1) + ''
       } else {
-        this.activeName = '1'
+        this.activeName = '0'
       }
     },
 
     backTab () {
-      let totalTab = 4
+      let totalTab = 3
+      if (this.formData.AuditIndex > 0) {
+        totalTab = 4
+      }
       if (this.formDataCert.Status > 0) {
+        totalTab = 5
+      }
+      if (this.formDataCert.Status >= 5) {
         totalTab = 6
       }
 
@@ -931,6 +943,7 @@ export default {
         } else {
           this.updateEntity()
         }
+        return true
       } else {
         return false
       }

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

@@ -6,10 +6,15 @@
       <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>
+    <no-ssr>
+      <div>
+        <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" v-if="certId">
+        </float-img-btn>
+      </div>
+    </no-ssr>
+
     <el-card class="box-card">
       <div slot="header">
         <span>
@@ -54,7 +59,7 @@
       </el-steps> -->
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane name="1" label="企业信息">
+        <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
@@ -69,7 +74,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane name="2" label="企业情况" :disabled="!certId">
+        <el-tab-pane label="企业情况" :disabled="!certId">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -195,16 +200,16 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="3" label="准入范围" :disabled="!certId">
+        <el-tab-pane label="准入范围" :disabled="!certId">
           <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" height="360px"
             style="margin-top: 20px"></tech-list>
         </el-tab-pane>
-        <el-tab-pane name="4" label="企业资质" :disabled="!certId">
+        <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" :flag="flag" @close="selectAuditOrg"
             height="360px" style="margin-top: 20px"></subfile-list>
         </el-tab-pane>
 
-        <el-tab-pane name="5" label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -217,7 +222,7 @@
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="6" label="审批历史" v-if="this.formData.AuditIndex > 0 ">
+        <el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">
           <el-card class="box-card" style="margin-top: 20px">
             <div slot="header" class="clearfix">
               <span>审批历史</span>
@@ -225,7 +230,7 @@
             <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="7" label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>
@@ -322,7 +327,7 @@
 
     data () {
       return {
-        activeName: '1',
+        activeName: '0',
         chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
@@ -582,7 +587,6 @@
       isCanUpdateSupplier(supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
-          console.log(this.canUpdateSupplier, 'this.canUpdateSupplier')
         }).catch(err => {
           console.error(err)
         })
@@ -702,10 +706,17 @@
         })
       },
       nextTab () {
-        let totalTab = 4
+        let totalTab = 3
+        if (this.formData.AuditIndex > 0) {
+          totalTab = 4
+        }
         if (this.formDataCert.Status > 0) {
+          totalTab = 5
+        }
+        if (this.formDataCert.Status >= 5) {
           totalTab = 6
         }
+
         let valid = true
         if (this.formDataCert.Status <= 0 && this.activeName === '0') {
           valid = this.saveEntity()
@@ -719,13 +730,19 @@
         if (activeIdx < totalTab) {
           this.activeName = (activeIdx + 1) + ''
         } else {
-          this.activeName = '1'
+          this.activeName = '0'
         }
       },
 
       backTab () {
-        let totalTab = 4
+        let totalTab = 3
+        if (this.formData.AuditIndex > 0) {
+          totalTab = 4
+        }
         if (this.formDataCert.Status > 0) {
+          totalTab = 5
+        }
+        if (this.formDataCert.Status >= 5) {
           totalTab = 6
         }
 
@@ -744,7 +761,7 @@
       }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
 
@@ -768,6 +785,7 @@
           } else {
             this.updateEntity()
           }
+          return true
         } else {
           return false
         }