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

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

@@ -27,7 +27,7 @@
         <el-form-item>
           <span>日期：</span>
           <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
@@ -43,7 +43,8 @@
 
         <!--部门-->
         <el-form-item>
-          <span>部门名称：</span>
+          <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
+          <span v-else>申请部门：</span>
           <el-select
             v-model="abilityDepartment"
             placeholder="请选择部门"
@@ -51,7 +52,7 @@
             clearable
           >
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
@@ -155,7 +156,7 @@
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
             </el-table-column>
-            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2'>
+            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
             </el-table-column>
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
@@ -462,6 +463,7 @@ export default {
       this.$http
         .get('/census/center/selectDeptDetailTypeCountList/', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: 5,
             approveStatus: this.status,
@@ -527,6 +529,7 @@ export default {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
           params: {
+            type: this.abilityType,
             page: page || 1,
             limit: this.pageSize,
             approveStatus: this.status,
@@ -702,6 +705,7 @@ export default {
             limit: 5,
             // page: page || 1,
             approveStatus: '',
+            type: '',
             deptId: '',
             params: '',
             startDate: ''
@@ -881,8 +885,8 @@ export default {
     // 点击查询按钮查询数据
     getDataList () {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
+        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
       } else {
         this.startDate = ''
         this.endDate = ''