审批-企业资质

src/dashoo.cn/frontend_web/src/components/oilsupplier/auditbuslist.vue

@@ -59,18 +59,16 @@
       <!--</el-pagination>-->
     <!--</el-card>-->
 
-    <el-card class="box-card" style="margin-top: 10px;">
+    <el-card class="box-card" style="margin-top: -20px">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">企业资质</span>
+        <span>企业资质</span>
         <span style="float: right;">
           <el-button type="primary" size="mini"  v-if ="Visiblebtn =='0'" @click="AuditEntity">提交审批</el-button>
         </span>
-        <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog">添加</el-button> -->
       </div>
       <auditfile-list ref="auditfileList" :data="auditfileList" :SupplierId="SupplierId"
         :SupplierCertId="SupplierCertId" :SupplierTypeCode="SupplierTypeCode" :businessList="auditbusList"
-         height="360px" style="margin-top: 20px"></auditfile-list>
-      <!--:BusinessForm="BusinessForm"-->
+         height="360px"></auditfile-list>
     </el-card>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -3,7 +3,7 @@
     <el-card class="box-card">
       <div slot="header"
            class="clearfix">
-        <span style="font-weight: bold">准入范围</span>
+        <span>准入范围</span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()"
                      v-if="canadd && IsCompanyUser == 0">

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist2.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-card class="box-card" style="margin-top: 10px;">
+    <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold"> 企业资质</span>
+        <span> 企业资质</span>
         <!--<el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
                    v-if="canadd && IsCompanyUser == 0">
           提交审批

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

@@ -313,8 +313,7 @@
                       :Grade="formData.Grade"
                       height="360px"
                       @tab-click="tabclick()"
-                      @commitAudit="commitAudit"
-                      style="margin-top: 20px"></goods-list2>
+                      @commitAudit="commitAudit"></goods-list2>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程"

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

@@ -159,19 +159,18 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" :canadd="add_flat"  :candelete="delete_flat" height="360px"
-            style="margin-top: 20px"></goods-list>
-        </el-tab-pane>
-
         <el-tab-pane label="企业资质">
           <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-            :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px">
+                         :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px">
           </auditbus-list>
         </el-tab-pane>
 
+        <el-tab-pane label="准入范围" :disabled="!certId">
+          <goods-list ref="goodsList" :data.sync="goodsList" :canadd="add_flat"  :candelete="delete_flat" height="360px"></goods-list>
+        </el-tab-pane>
+
         <el-tab-pane label="流程查看">
-          <el-card class="box-card" style="margin-top: 20px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
             </div>
@@ -389,7 +388,7 @@
   import WinningList from '@/components/oilsupplier/winninglist'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
-  import GoodsList from '@/components/oilsupplier/goodslist'
+  import GoodsList from '@/components/oilsupplier/goodslist2'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {