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

@@ -1,60 +1,17 @@
 <template>
   <div>
     <div class="container">
-<!--能力上架统计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">
-        <el-form-item>
-          <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>
-            <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="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>
 
-      <!--能力上架明细3 能力使用明细 4-->
+      
-        <el-form  :inline="true"  v-else>
+      <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>
         <!--审核状态-->
-        <a-col :span="6">
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>审核状态：</span>
           <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
@@ -64,11 +21,10 @@
             <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-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
           <span v-else>申请部门：</span>
           <el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
             <el-option label="全部" value=""></el-option>
@@ -76,46 +32,32 @@
               v-bind="item"></el-option>
           </el-select>
         </el-form-item>
-        </a-col>
+
-         <!--能力使用统计明细--添加提供部门-->
+        <!--类型-->
-         <a-col :span="6">
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
-        <el-form-item v-if=" this.departmentId === 4">
+          <span>类型：</span>
-          <span >提供部门：</span>
+          <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
-          <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-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 >
+        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
-          <span>资源名称：</span>
+          <span>名称：</span>
-          <el-input style="width:70%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
+          <!-- <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>
-    </a-col>
+      </el-form>
-    <a-col :span="12">
+      <el-form :inline="true" style="margin-right: 40px;">
          <!--操作按钮查询-->
          <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -129,13 +71,17 @@
         <!-- 导出 -->
         <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="[
@@ -275,7 +221,6 @@ export default {
   data () {
     return {
       checked: false,
-      provideSelects:[],
       departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
@@ -381,8 +326,7 @@ export default {
       examineStatus: '-1', // 审核状态
       status: '',
       value1: [], // 起始时间
-      abilityDepartment: '', // 上架部门或申请部门
+      abilityDepartment: '', // 部门
-      provideDepartment:'',//提供部门
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
@@ -410,11 +354,10 @@ 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 })
       })
     })
     // 当前设定的日期时间
@@ -726,7 +669,7 @@ export default {
           })
         })
     },
-    // 能力使用明细 
+    // 能力使用明细 能力使用统计
     getTwoDetail (page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
@@ -740,7 +683,6 @@ export default {
       } else {
         this.status = this.examineStatus
       }
-
       this.$http
         .get('/census/center/selectCensusApplyTable', {
           params: {
@@ -751,9 +693,7 @@ export default {
             type: this.abilityType,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName: this.resourceName,
+            resourceName: this.resourceName
-            provideDept:this.provideDepartment
-
           }
         })
         .then((res) => {
@@ -765,8 +705,7 @@ export default {
             deptId: this.abilityDepartment,
             startDate: this.startDate,
             endDate: this.endDate,
-            resourceName: this.resourceName,
+            resourceName: this.resourceName
-            provideDept:this.provideDepartment
           })
         })
     },
@@ -856,8 +795,18 @@ export default {
       this.choseId = index
       this.handleChose(1)
     },
-
+    //   choseBtn(index){
-    // 根据不同的type查询不同的表格数据
+    //     this.choseId=index
+    //     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
@@ -871,7 +820,7 @@ export default {
           this.exportExcelType = 'SelectDeptDetailTypeCountList'
           this.getFirstTree()
         } else if (this.choseId === 1) {
-
+          // this.getReleaseTree()
         }
       } else if (index === 2) {
         if (this.choseId === 0) {
@@ -881,7 +830,7 @@ export default {
           this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
           this.getSecondTree()
         } else {
- 
+          // this.getUsedTree()
         }
       } else if (index === 3) {
         this.detailFlag = false
@@ -889,7 +838,7 @@ export default {
           this.exportExcelType = 'SelectCensusResourceTable'
           this.getOneDetail()
         } else {
-     
+          // this.getUsedTree()
         }
       } else if (index === 4) {
         this.detailFlag = false
@@ -897,7 +846,7 @@ export default {
           this.exportExcelType = 'SelectCensusApplyTable'
           this.getTwoDetail()
         } else {
-
+          // this.getUsedTree()
         }
       }
     },
@@ -994,10 +943,8 @@ 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,
@@ -1005,14 +952,26 @@ 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)
-      } else if (this.departmentId === 2) {//能力使用统计
+        //   this.detailFlag = !this.detailFlag
+        // }
+        // 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,10 +245,8 @@ 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({
@@ -266,7 +264,7 @@ export default {
                 }
                 return
               }
-              bus.$emit('applicationforRequirementsInit')
+              bus.$emit('AbilityResourcesRemovedInit')
               this.$message({
                 message: this.$t('prompt.success'),
                 type: 'success',
@@ -301,7 +299,7 @@ export default {
                   }
                   return
                 }
-                bus.$emit('applicationforRequirementsInit')
+                bus.$emit('AbilityResourcesRemovedInit')
                 this.$message({
                   message: this.$t('prompt.success'),
                   type: 'success',

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

@@ -215,7 +215,9 @@ 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,7 +128,6 @@
 </template>
 
 <script>
-import bus from '@/views/bus.js'
 import mixinViewModule from '@/mixins/view-module'
 import processModule from '@/mixins/process-module'
 export default {
@@ -154,6 +153,7 @@ export default {
   methods: {
     // 处理
     taskHandle (row) {
+      console.log('row======================>', row, this.forwardHandleUrl)
       if (!row.businessKey) {
         return this.$message.error(this.$t('task.businessKeyError'))
       }
@@ -165,13 +165,6 @@ 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,8 +415,11 @@ export default {
     // 同意与退回
     agreeOrNot: debounce(
       function (data, type) {
-        if (type === '同意') {
+        // console.log('datadata',data);
-    
+        // 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 {
-    max-height: 2.9rem;
+    // 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" v-if="item.title">{{ item.title }}</b>
+        <b class="leftType">{{ item.title }}</b>
         <el-button
           @click="nullClick"
           v-if="item.title == '视频标签'"
@@ -266,7 +266,8 @@
         <a-form
           :model="formState"
           name="basic"
-       
+          :label-col="{ span: 8 }"
+          :wrapper-col="{ span: 16 }"
           autocomplete="off"
           @finish="onFinish"
           @finishFailed="onFinishFailed"
@@ -2527,7 +2528,7 @@
     .infrastructrue-content {
       display: flex;
       justify-content: space-between;
-      padding: 0.01rem 0.2rem 0.1rem;
+      padding: 0.14rem 0.2rem 0.1rem;
       background: #ffffff;
 
       .contentNum {
@@ -2686,7 +2687,7 @@
       font-size: 14px;
     }
     :deep(.ant-form-item-control) {
-      // margin-left: -2.1rem;
+      margin-left: -2.1rem;
     }
   }