新需求

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

@@ -30,6 +30,8 @@
       </div>
     </div>
     <el-form :inline="true">
+      <a-row>
+        <a-col :span="6">
       <el-form-item>
         <span>日期：</span>
         <el-date-picker
@@ -43,8 +45,9 @@
         >
         </el-date-picker>
       </el-form-item>
-
+     </a-col>
       <!--提供部门 传id-->
+      <a-col :span="6">
       <el-form-item>
         <span>提供部门：</span>
         <el-select
@@ -63,8 +66,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-
+</a-col>
       <!--申请部门 传汉字-->
+      <a-col :span="6">
       <el-form-item>
         <span>申请部门：</span>
         <el-select
@@ -83,10 +87,12 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      </a-col>
 
       <!--类型-->
+      <a-col :span="6">
       <el-form-item>
-        <span>类型：</span>
+        <span>资源类型：</span>
         <el-select
           @change="changeIiem"
           v-model="dataForm.resourceType"
@@ -104,18 +110,32 @@
           </el-option>
         </el-select>
       </el-form-item>
+      </a-col>
+    </a-row>
       <!--名称-->
+      <a-row>
+        <a-col :span="6">
       <el-form-item>
-        <span>名称：</span>
+        <span>资源名称：</span>
         <el-input
-          style="width: 80%"
+          style="width: 70%"
           v-model="dataForm.resourceName"
           placeholder="请输入资源名称"
           clearable
         ></el-input>
       </el-form-item>
-    </el-form>
+        </a-col>
-    <el-form :inline="true" style="margin-right: 40px">
+        <a-col :span="6">
+      <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>
+        </a-col>
+        <a-col :span="12">
        <!--操作按钮查询-->
        <el-form-item>
         <el-button type="primary" @click="init()">{{
@@ -133,14 +153,17 @@
         :href="
           exportExcel +
           '?' +
-          dataForm +
+          exportExcelCondition +
           '&token=' +
           token
         "
         >导出全部</a
       >
+        </a-col>
+        </a-row>
     </el-form>
     
+
     <div class="mod-activiti__process">
       <el-table
         :data="tableData"
@@ -165,6 +188,12 @@
           header-align="center"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="applyResult"
+          label="审核状态"
+          header-align="center"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="provideDept"
           label="提供部门"
@@ -207,11 +236,12 @@
 <script>
 
 import Cookies from 'js-cookie'
-
+import qs from 'qs'
 export default {
 
   data() {
     return {
+      exportExcelCondition:'',
         token: Cookies.get('ucsToken'),
         //导出全部
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
@@ -236,6 +266,7 @@ export default {
         applyDept: "",
         resourceType: "",
         resourceName: "",
+        applyResult:"",
         pageNum:1,
         pageSize:10,
       },
@@ -266,7 +297,8 @@ export default {
           price=Math.round(price / 10000);
           this.saveMoney=price.toFixed(1)
           this.total=Number(res.data.data.total);
-        });
+          this.exportExcelCondition = qs.stringify(this.dataForm)
+    })
   },
     handleCurrentChange(val) {
       this.currentPage = val;
@@ -280,6 +312,7 @@ export default {
       this.dataForm.resourceName = "";
       this.dataForm.applyDept = "";
       this.dataForm.provideDept = "";
+      this.dataForm.applyResult="";
       this.currentPage = 1;
       this.init();
     },