入库列表样式

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -159,7 +159,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label-width="150px" label="统一社会信用代码" prop="CommercialNo">
+                  <el-form-item label="统一社会信用代码" prop="CommercialNo">
                     <el-input v-model="supplierData.CommercialNo" maxlength="50" :readonly="true"
                               :class="changedForm['CommercialNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">

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

@@ -37,7 +37,7 @@
       </div>
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="企业信息">
+        <el-tab-pane label="企业信息" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
@@ -52,7 +52,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="企业情况" :disabled="!certId">
+        <el-tab-pane label="企业情况" name="2" :disabled="!certId">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -179,16 +179,17 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围" :disabled="!certId">
+        <el-tab-pane label="企业资质" name="3" :disabled="!certId">
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
+                        height="360px" style="margin-top: 20px"></subfile-list>
+        </el-tab-pane>
+
+        <el-tab-pane label="准入范围" name="4" :disabled="!certId">
           <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
             height="360px" style="margin-top: 20px" :candelete="delete_flat" :newcanadd="newadd_flat"></business-list>
         </el-tab-pane>
-        <el-tab-pane label="企业资质" :disabled="!certId">
-          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
-            height="360px" style="margin-top: 20px"></subfile-list>
-        </el-tab-pane>
 
-        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" name="5" v-if="formDataCert.Status > 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -356,7 +357,7 @@
         dialogApplyTime: false,
         delete_flat: true,
         newadd_flat: true,
-        activeName: '0',
+        activeName: '1',
         chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
@@ -834,7 +835,7 @@
       },
       nextTab () {
         let activeIdx = parseInt(this.activeName)
-        if (activeIdx < 4) {
+        if (activeIdx < 5) {
           this.activeName = (activeIdx + 1) + ''
         } else {
           this.activeName = '1'

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

@@ -37,7 +37,7 @@
       </div>
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="企业信息">
+        <el-tab-pane label="企业信息" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
@@ -52,7 +52,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="企业情况" :disabled="!certId">
+        <el-tab-pane label="企业情况" name="2" :disabled="!certId">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -180,17 +180,18 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="准入范围" :disabled="!certId">
+        <el-tab-pane label="企业资质" name="3" :disabled="!certId">
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
+                        height="360px" style="margin-top: 20px"></subfile-list>
+        </el-tab-pane>
+
+        <el-tab-pane label="准入范围" name="4" :disabled="!certId">
           <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat"
                       :operType="formData.OperType" height="360px"
             style="margin-top: 20px" :candelete="delete_flat"></goods-list>
         </el-tab-pane>
-        <el-tab-pane label="企业资质" :disabled="!certId">
-          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
-            height="360px" style="margin-top: 20px"></subfile-list>
-        </el-tab-pane>
 
-        <el-tab-pane label="审批流程" v-if="formDataCert.Status > 0">
+        <el-tab-pane label="审批流程" name="5" v-if="formDataCert.Status > 0">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
@@ -334,7 +335,7 @@
         innerVisible: false,
         dialogApplyTime: false,
         delete_flat: true,
-        activeName: '0',
+        activeName: '1',
         chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
@@ -833,7 +834,7 @@
       },
       nextTab () {
         let activeIdx = parseInt(this.activeName)
-        if (activeIdx < 4) {
+        if (activeIdx < 5) {
           this.activeName = (activeIdx + 1) + ''
         } else {
           this.activeName = '1'

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

@@ -187,14 +187,17 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="3" label="准入范围" :disabled="!certId">
+
+        <el-tab-pane name="3" label="企业资质" :disabled="!certId">
+          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
+                        height="360px" style="margin-top: 20px"></subfile-list>
+        </el-tab-pane>
+
+        <el-tab-pane name="4" label="准入范围" :disabled="!certId">
           <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat" height="360px"
             style="margin-top: 20px" :candelete="delete_flat"></tech-list>
         </el-tab-pane>
-        <el-tab-pane name="4" label="企业资质" :disabled="!certId">
-          <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg" :newcanadd="newadd_flat"
-            height="360px" style="margin-top: 20px"></subfile-list>
-        </el-tab-pane>
+
 
         <el-tab-pane name="5" label="审批流程" v-if="formDataCert.Status > 0">
           <el-card class="box-card">
@@ -887,7 +890,7 @@
       },
       nextTab () {
         let activeIdx = parseInt(this.activeName)
-        if (activeIdx < 4) {
+        if (activeIdx < 5) {
           this.activeName = (activeIdx + 1) + ''
         } else {
           this.activeName = '1'