Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/assetReport/index.vue

@@ -44,7 +44,35 @@
         >
         </el-date-picker>
       </el-form-item>
-      
+       <!--审核状态-->
+       <el-form-item>
+        <span>审核状态：</span>
+        <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
+            <el-option label="全部" value=""></el-option>
+             <el-option label="通过" value="通过"></el-option>
+            <el-option label="审核中" value="审核中"></el-option>  
+          </el-select>
+      </el-form-item>
+       <!--申请部门 传汉字-->
+   
+       <el-form-item>
+        <span>申请部门：</span>
+        <el-select
+          v-model="dataForm.applyDept"
+          placeholder="请选择申请部门"
+          filterable
+          clearable
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option
+            v-for="item in applyDepartSelects"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            v-bind="item"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <!--提供部门 传id-->
 
       <el-form-item>
@@ -66,29 +94,15 @@
         </el-select>
       </el-form-item>
 
-      <!--申请部门 传汉字-->
-   
-      <el-form-item>
-        <span>申请部门：</span>
-        <el-select
-          v-model="dataForm.applyDept"
-          placeholder="请选择申请部门"
-          filterable
-          clearable
-        >
-          <el-option label="全部" value=""></el-option>
-          <el-option
-            v-for="item in applyDepartSelects"
-            :key="item.label"
-            :label="item.label"
-            :value="item.value"
-            v-bind="item"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+     
     
   
-      <!--资源类型-->
+      
+      </el-form>
+  
+
+      <el-form :inline="true">
+        <!--资源类型-->
         <el-form-item>
         <span>资源类型：</span>
         <el-select
@@ -108,19 +122,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      </el-form>
-  
-
-      <el-form :inline="true">
-    <!--审核状态-->
-      <el-form-item>
-        <span>审核状态：</span>
-        <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
-            <el-option label="全部" value=""></el-option>
-             <el-option label="通过" value="通过"></el-option>
-            <el-option label="审核中" value="审核中"></el-option>  
-          </el-select>
-      </el-form-item>
+   
         <!--资源名称-->
         <el-form-item>
         <span>资源名称：</span>