From 2b5c612d201134dabb0ea4bae68f6ae4cb6e66af Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 23 Nov 2022 18:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/App.vue                              |  6 +-
 .../views/modules/abilityStatistics/index.vue | 58 ++++++++++---------
 back/src/views/modules/assetReport/index.vue  | 41 ++++++-------
 3 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/back/src/App.vue b/back/src/App.vue
index 90b247b5..a3ce4034 100644
--- a/back/src/App.vue
+++ b/back/src/App.vue
@@ -16,7 +16,7 @@
     display: table-cell !important;
   }
 
-  .el-button {
+   /* .el-button {
     vertical-align: middle !important;
     align-items: center !important;
     display: inline-flex !important;
@@ -25,7 +25,7 @@
     justify-content: center !important;
     min-width: 80px !important;
     border-radius:2px !important;  
-  }
+  } */
   .el-button--primary {
     vertical-align: middle !important;
     align-items: center !important;
@@ -35,7 +35,7 @@
     justify-content: center !important;
     min-width: 80px !important;
     border-radius:2px !important;  
-  }
+  } 
 </style>
 <script>
 import Cookies from 'js-cookie'
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 661c8796..4dfd21b6 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -4,16 +4,9 @@
 <!--能力上架统计1 能力使用统计 2-->
       <el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2">
         <a-row>
-          <a-col :span="6">
-        <el-form-item>
-          <span>日期：</span>
-          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        </a-col>
+         
          <!--上架部门-->
-         <a-col :span="6">
+         <a-col :span="8">
         <el-form-item>
           <span v-if="this.departmentId === 1 ">上架部门：</span>
           <span v-else>申请部门：</span>
@@ -24,7 +17,15 @@
           </el-select>
         </el-form-item>
         </a-col>
-        <a-col :span="12">
+        <a-col :span="8">
+        <el-form-item>
+          <span>日期：</span>
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        </a-col>
+        <a-col :span="8">
               <!--操作按钮查询-->
          <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -45,14 +46,7 @@
       <!--能力上架明细3 能力使用明细 4-->
         <el-form  :inline="true"  v-else>
         <a-row>
-          <a-col :span="6">
-        <el-form-item>
-          <span>日期：</span>
-          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        </a-col>
+        
         <!--审核状态-->
         <a-col :span="6">
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
@@ -78,19 +72,19 @@
         </el-form-item>
         </a-col>
          <!--能力使用统计明细--添加提供部门-->
-         <a-col :span="6">
-        <el-form-item v-if=" this.departmentId === 4">
-          <span >提供部门：</span>
-          <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
-              v-bind="item"></el-option>
-          </el-select>
+        
+        <a-col :span="12">
+        <el-form-item>
+          <span>日期：</span>
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
         </el-form-item>
-        </a-col>   
+        </a-col> 
       </a-row>
         <!--资源类型-->
         <a-row>
+          
           <a-col :span="6">
         <el-form-item >
           <span>资源类型：</span>
@@ -115,6 +109,16 @@
           <el-input style="width:70%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
         </el-form-item>
     </a-col>
+    <a-col :span="6">
+        <el-form-item v-if=" this.departmentId === 4">
+          <span >提供部门：</span>
+          <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
+              v-bind="item"></el-option>
+          </el-select>
+        </el-form-item>
+        </a-col>  
     <a-col :span="12">
               <!--操作按钮查询-->
          <el-form-item>
diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index 654dcd33..19bad427 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -31,21 +31,7 @@
     </div>
     <el-form :inline="true">
       <a-row>
-        <a-col :span="6">
-      <el-form-item>
-        <span>日期：</span>
-        <el-date-picker
-          v-model="dateList"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        >
-        </el-date-picker>
-      </el-form-item>
-     </a-col>
+      
       <!--提供部门 传id-->
       <a-col :span="6">
       <el-form-item>
@@ -88,8 +74,25 @@
         </el-select>
       </el-form-item>
       </a-col>
-
+      <a-col :span="12">
+      <el-form-item>
+        <span>日期：</span>
+        <el-date-picker
+          v-model="dateList"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+     </a-col>
       <!--类型-->
+      
+    </a-row>
+      <!--名称-->
       <a-col :span="6">
       <el-form-item>
         <span>资源类型：</span>
@@ -111,8 +114,6 @@
         </el-select>
       </el-form-item>
       </a-col>
-    </a-row>
-      <!--名称-->
       <a-row>
         <a-col :span="6">
       <el-form-item>
@@ -135,7 +136,7 @@
           </el-select>
       </el-form-item>
         </a-col>
-        <a-col :span="12">
+        <a-col :span="6">
        <!--操作按钮查询-->
        <el-form-item>
         <el-button type="primary" @click="init()">{{
@@ -266,7 +267,7 @@ export default {
         applyDept: "",
         resourceType: "",
         resourceName: "",
-        applyResult:"",
+        applyResult:"通过",
         pageNum:1,
         pageSize:10,
       },