年审

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

@@ -569,13 +569,14 @@
               this.auditstepcode = 'PROF_RECE'
             } else if (this.anndata.Status === '4') {
               this.auditstepcode = 'PROF_AUDIT'
-            }
-            if (this.anndata.SupplierTypeName === '01') {
-              this.auditstepcode = 'SUB_OFFICE_WZ'
-            } else if (this.anndata.SupplierTypeName === '02') {
-              this.auditstepcode = 'SUB_OFFICE_JS'
-            } else if (this.anndata.SupplierTypeName === '03') {
-              this.auditstepcode = 'SUB_OFFICE_JF'
+            } else if (this.anndata.Status === '10') {
+              if (this.anndata.SupplierTypeName === '01') {
+                this.auditstepcode = 'SUB_OFFICE_WZ'
+              } else if (this.anndata.SupplierTypeName === '02') {
+                this.auditstepcode = 'SUB_OFFICE_JS'
+              } else if (this.anndata.SupplierTypeName === '03') {
+                this.auditstepcode = 'SUB_OFFICE_JF'
+              }
             }
           }
           this.isAccess()

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -122,7 +122,7 @@
       <el-form label-width="110px" style="text-align:right">
         <el-row :gutter="10">
           <el-col :span="10">
-            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px">
+            <el-card style="width: 100%;height: calc(100vh - 283px);margin-top:0px;overflow: auto;">
               <div slot="header" class="clearfix">
                 <span>请选择部门</span>
               </div>