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

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

@@ -1,30 +1,21 @@
 <template>
   <div>
     <div class="container">
-
+<!--能力上架统计1 能力使用统计 2-->
-      
+      <el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2">
-      <el-form :inline="true">
+        <a-row>
-        <!--起始日期 @keyup.enter.native="getDataList()"-->
+          <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>
-        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
+         <!--上架部门-->
-          <span>审核状态：</span>
+         <a-col :span="6">
-          <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
-            <el-option label="全部" value="-1"></el-option>
-            <el-option label="审核中" value="0"></el-option>
-            <el-option label="通过" value="1"></el-option>
-            <el-option label="不通过" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <!--部门-->
         <el-form-item>
-          <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
+          <span v-if="this.departmentId === 1 ">上架部门：</span>
           <span v-else>申请部门：</span>
           <el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
             <el-option label="全部" value=""></el-option>
@@ -32,33 +23,9 @@
               v-bind="item"></el-option>
           </el-select>
         </el-form-item>
-
+        </a-col>
-        <!--类型-->
+        <a-col :span="12">
-        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
+              <!--操作按钮查询-->
-          <span>类型：</span>
-          <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
-              v-bind="item">
-            </el-option>
-          </el-select>
-          <el-select   @change="changeIiem" v-else v-model="abilityType" placeholder="请选择类型" clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
-              v-bind="item">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!--资源名称 仅明细添加-->
-
-        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
-          <span>名称：</span>
-          <!-- <span v-if="this.departmentId === 2 || this.departmentId === 4">资源名称：</span> -->
-          <el-input style="width:80%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" style="margin-right: 40px;">
-         <!--操作按钮查询-->
          <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -71,17 +38,104 @@
         <!-- 导出 -->
         <a class='export'
           :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
+        </a-col>
+        </a-row>
       </el-form>
+  
+      <!--能力上架明细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">
+          <span>审核状态：</span>
+          <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
+            <el-option label="全部" value="-1"></el-option>
+            <el-option label="审核中" value="0"></el-option>
+            <el-option label="通过" value="1"></el-option>
+            <el-option label="不通过" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        </a-col>
+           <!--上架部门-->
+           <a-col :span="6">
+        <el-form-item>
+          <span v-if=" this.departmentId === 3">上架部门：</span>
+          <span v-else>申请部门：</span>
+          <el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
+            <el-option label="全部" value=""></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>
+        </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-row>
+        <!--资源类型-->
+        <a-row>
+          <a-col :span="6">
+        <el-form-item >
+          <span>资源类型：</span>
+          <el-select  @change="changeIiem" v-if="this.departmentId === 4"   v-model="abilityType" placeholder="请选择资源类型" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
+              v-bind="item">
+            </el-option>
+          </el-select>
+          <el-select   @change="changeIiem" v-else v-model="abilityType" placeholder="请选择资源类型" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
+              v-bind="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        </a-col>
+        <!--资源名称 仅明细添加-->
+        <a-col :span="6">
+        <el-form-item >
+          <span>资源名称：</span>
+          <el-input style="width:70%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
+        </el-form-item>
+    </a-col>
+    <a-col :span="12">
+              <!--操作按钮查询-->
+         <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!--操作按钮重置-->
+        <el-form-item>
+          <el-button type="primary" @click="resetDataList()">{{
+              $t('reset')
+          }}</el-button>
+        </el-form-item>
+        <!-- 导出 -->
+        <a class='export'
+          :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
+        </a-col>
+    </a-row>
+
+  </el-form> 
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
-          <!--  <div class='top-box'>
+     
-            <span class='title'>能力统计</span>
-            <div class='title-list-style'>
-            <div v-for="(item,index) in titleList" :key='index' class='title-single' :class="{'choseStyle':choseId=== index}" @click="choseBtn(index)">
-             <span class='box-style'>{{item.name}}</span>
-            </div>
-           </div>
-        </div> -->
 
           <div class="second-title">
             <span style="margin-right: 30px" :class="[
@@ -221,6 +275,7 @@ export default {
   data () {
     return {
       checked: false,
+      provideSelects:[],
       departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
@@ -326,7 +381,8 @@ export default {
       examineStatus: '-1', // 审核状态
       status: '',
       value1: [], // 起始时间
-      abilityDepartment: '', // 部门
+      abilityDepartment: '', // 上架部门或申请部门
+      provideDepartment:'',//提供部门
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
@@ -354,10 +410,11 @@ export default {
   },
   created () {
     this.$http.get('/sys/dept/all').then(res => {
-      // console.log('获取部门=========>', res)
       this.departmentSelects = []
+      this.provideSelects = []
       res.data.data.map(val => {
         this.departmentSelects.push({ label: val.name, value: val.id })
+        this.provideSelects.push({ label: val.name, value: val.name })
       })
     })
     // 当前设定的日期时间
@@ -669,7 +726,7 @@ export default {
           })
         })
     },
-    // 能力使用明细 能力使用统计
+    // 能力使用明细 
     getTwoDetail (page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
@@ -683,6 +740,7 @@ export default {
       } else {
         this.status = this.examineStatus
       }
+
       this.$http
         .get('/census/center/selectCensusApplyTable', {
           params: {
@@ -693,7 +751,9 @@ export default {
             type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName: this.resourceName
+            resourceName: this.resourceName,
+            provideDept:this.provideDepartment
+
           }
         })
         .then((res) => {
@@ -705,7 +765,8 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName: this.resourceName
+            resourceName: this.resourceName,
+            provideDept:this.provideDepartment
           })
         })
     },
@@ -795,18 +856,8 @@ export default {
       this.choseId = index
       this.handleChose(1)
     },
-    //   choseBtn(index){
+
-    //     this.choseId=index
+    // 根据不同的type查询不同的表格数据
-    //     if (index===0){
-    //         this.homeIsShow=false
-    //         this.servicesIsShow=true
-    //     } else if(index===1){
-    //         this.homeIsShow=false
-    //         this.servicesIsShow=false
-    //         this.resourcesIsShow=true
-    //     }
-    //   },
-    // 选择发布or使用表格
     handleChose (index) {
       this.checked = false
       this.departmentId = index
@@ -820,7 +871,7 @@ export default {
           this.exportExcelType = 'SelectDeptDetailTypeCountList'
           this.getFirstTree()
         } else if (this.choseId === 1) {
-          // this.getReleaseTree()
+
         }
       } else if (index === 2) {
         if (this.choseId === 0) {
@@ -830,7 +881,7 @@ export default {
           this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
-          // this.getUsedTree()
+ 
         }
       } else if (index === 3) {
         this.detailFlag = false
@@ -838,7 +889,7 @@ export default {
           this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
-          // this.getUsedTree()
+     
         }
       } else if (index === 4) {
         this.detailFlag = false
@@ -846,7 +897,7 @@ export default {
           this.exportExcelType = 'SelectCensusApplyTable'
           this.getTwoDetail()
         } else {
-          // this.getUsedTree()
+
         }
       }
     },
@@ -943,8 +994,10 @@ export default {
       this.endDate = ''
       this.examineStatus = ''
       this.abilityDepartment = ''
+      this.provideDepartment=''
       this.abilityType = ''
       this.approveStatus = ''
+      this.resourceName=''
       this.exportExcelCondition = qs.stringify({
         approveStatus: this.status,
         deptId: this.abilityDepartment,
@@ -952,26 +1005,14 @@ export default {
         endDate: this.endDate,
         resourceName: this.resourceName
       })
-      if (this.departmentId === 1) {
+      if (this.departmentId === 1) {//能力上架统计
-        // if (this.detailFlag) {
-        //   this.handleChose(3)
-        //   this.detailFlag = !this.detailFlag
-        // } else {
         this.handleChose(1)
-        //   this.detailFlag = !this.detailFlag
+      } else if (this.departmentId === 2) {//能力使用统计
-        // }
-        // this.departmentId = 1;
-      } else if (this.departmentId === 2) {
-        // if (this.detailFlag) {
-        //   this.handleChose(4)
-        //   this.detailFlag = !this.detailFlag
-        // } else {
         this.handleChose(2)
-        //   this.detailFlag = !this.detailFlag
+    
-        // }
+      } else if (this.departmentId === 3) {//能力上架明细
-      } else if (this.departmentId === 3) {
         this.handleChose(3)
-      } else {
+      } else {//能力使用明细
         this.handleChose(4)
       }
     },

back/src/views/modules/activiti/demo/abilitydemandapply.vue

@@ -245,8 +245,10 @@ export default {
     // 同意与退回
     agreeOrNot: debounce(
       function (data, type) {
+    
         this.dataForm.taskId = this.$route.params.taskId
         if (type === '同意') {
+          debugger
           // if (this.input !== '') {
           console.log('this.dataForm', this.dataForm)
           const params = qs.stringify({
@@ -264,7 +266,7 @@ export default {
                 }
                 return
               }
-              bus.$emit('AbilityResourcesRemovedInit')
+              bus.$emit('applicationforRequirementsInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -299,7 +301,7 @@ export default {
                   }
                   return
                 }
-                bus.$emit('AbilityResourcesRemovedInit')
+                bus.$emit('applicationforRequirementsInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

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

@@ -215,9 +215,7 @@ export default {
         token: Cookies.get('ucsToken'),
         //导出全部
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/processForm/tabilityapplication/exportFundStatementTable',
-
+      saveMoney: 0.0,
-
-      saveMoney: 3243,
       offerDepartSelects: [],
       applyDepartSelects: [],
       typeOptions: [

back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue

@@ -128,6 +128,7 @@
 </template>
 
 <script>
+import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -153,7 +154,6 @@ export default {
   methods: {
     // 处理
     taskHandle (row) {
-      console.log('row======================>', row, this.forwardHandleUrl)
       if (!row.businessKey) {
         return this.$message.error(this.$t('task.businessKeyError'))
       }
@@ -165,6 +165,13 @@ export default {
       }
       this.getProcDefRouteSet(row, this.forwardTaskDetail)
     }
+  },
+  created () {
+    bus.$off('applicationforRequirementsInit')
+    bus.$on('applicationforRequirementsInit', () => {
+      this.getDataList()
+      bus.$emit('updateTaskNum')
+    })
   }
 }
 </script>

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -415,11 +415,8 @@ export default {
     // 同意与退回
     agreeOrNot: debounce(
       function (data, type) {
-        // console.log('datadata',data);
+        if (type === '同意') {
-        // console.log('tttttt',type);
+    
-        // if (type === '同意') {
-        if (this.input !== '') {
-          console.log('this.dataForm', this.dataForm)
           const params = qs.stringify({
             taskId: this.dataForm.taskId,
             comment: this.input || '同意'

front/src/views/home/AbilityToApplyFor.vue

@@ -267,7 +267,7 @@
 
 <style scoped lang="less">
   .ability-to-apply-for {
-    // height: 2.9rem;
+    max-height: 2.9rem;
     overflow: hidden;
 
     .title {

front/src/views/home/infrastructurePage.vue

@@ -4,7 +4,7 @@
     <!-- 选项卡 -->
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
-        <b class="leftType">{{ item.title }}</b>
+        <b class="leftType" v-if="item.title">{{ item.title }}</b>
         <el-button
           @click="nullClick"
           v-if="item.title == '视频标签'"
@@ -266,8 +266,7 @@
         <a-form
           :model="formState"
           name="basic"
-          :label-col="{ span: 8 }"
+       
-          :wrapper-col="{ span: 16 }"
           autocomplete="off"
           @finish="onFinish"
           @finishFailed="onFinishFailed"
@@ -2528,7 +2527,7 @@
     .infrastructrue-content {
       display: flex;
       justify-content: space-between;
-      padding: 0.14rem 0.2rem 0.1rem;
+      padding: 0.01rem 0.2rem 0.1rem;
       background: #ffffff;
 
       .contentNum {
@@ -2687,7 +2686,7 @@
       font-size: 14px;
     }
     :deep(.ant-form-item-control) {
-      margin-left: -2.1rem;
+      // margin-left: -2.1rem;
     }
   }