表头显示内容、分页组件位置调整

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

@@ -3,7 +3,7 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item><span v-if="AnnualStatus <= 0">基建类</span><span v-else>基建类</span></el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
@@ -2202,13 +2202,14 @@
             this.isAccess()
             this.getstatus(this.AnnualId)
             // this.$router.push('/')
+            this.btnLoading = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
+            this.btnLoading = false
           }
-          this.btnLoading = false
         }).catch(err => {
           this.dialogVisibleBack = false
           this.btnLoading = false
@@ -2244,14 +2245,15 @@
                 type: 'success',
                 message: res.data.message
               })
+              this.btnLoading = false
             } else {
               this.$message({
                 type: 'warning',
                 message: res.data.message
               })
+              this.btnLoading = false
             }
           })
-          this.btnLoading = false
         }).catch(() => {
           this.$message({
             type: 'info',

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

@@ -3,11 +3,11 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item><span v-if="Status <= 0">基建类</span><span v-else>基建类</span></el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>年审基本信息表</span>
+        <span v-if="formData.SupplierName">{{formData.SupplierName}}</span><span v-else>年审基本信息表</span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <!-- <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button> -->

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

@@ -3,7 +3,7 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item><span v-if="Status <= 0">物资类</span><span v-else>物资类</span></el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">

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

@@ -3,11 +3,11 @@
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item><span v-if="AnnualStatus <= 0">服务类</span><span v-else>服务类</span></el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>年审基本信息表</span>
+        <span v-if="formData.SupplierName">{{formData.SupplierName}}</span><span v-else>年审基本信息表</span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-popover>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请列表</el-breadcrumb-item>
       </el-breadcrumb>
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 年审申请表
+            <i class="icon icon-table2"></i> &nbsp;基建类
           </span>
           <span style="float: right;">
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
@@ -111,7 +111,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请列表</el-breadcrumb-item>
       </el-breadcrumb>
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 年审申请表
+            <i class="icon icon-table2"></i> &nbsp;物资类
           </span>
           <span style="float: right;">
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
@@ -111,7 +111,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请列表</el-breadcrumb-item>
       </el-breadcrumb>
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 年审申请表
+            <i class="icon icon-table2"></i> &nbsp;基建类
           </span>
           <span style="float: right;">
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
@@ -110,7 +110,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/basislist' }">基建类列表</el-breadcrumb-item>
       </el-breadcrumb>
@@ -107,7 +107,7 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/goodslist' }">物资类列表</el-breadcrumb-item>
       </el-breadcrumb>
@@ -107,7 +107,7 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/index.vue

@@ -111,7 +111,7 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                        :total="currentItemCount">
         </el-pagination>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="IsCompanyUser == 0 || (IsCompanyUser == 1 && suplen > 0)">
-      <el-breadcrumb class="heading">
+      <el-breadcrumb class="heading" style="padding-bottom: 10px">
         <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/techlist' }">服务类列表</el-breadcrumb-item>
       </el-breadcrumb>
@@ -109,7 +109,7 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        <el-pagination style="float: right; margin-top: 10px; margin-bottom: 5px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
           :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>