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

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-10-21 09:31:25
+ * @LastEditTime: 2022-10-21 16:11:46
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -94,7 +94,7 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>{{ $t('process.entrustTask') }}</el-button>
+        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
@@ -269,9 +269,25 @@ export default {
               this.dataForm,
               'elas============================'
             )
-            if (res.data.tAbilityApplicationDTOList[0].allowEntrust === true) {
+            this.$http
+              .get(
+            `/act/task/getTaskVariables?${params}&variableName=allowEntrust`
+              ).then(entrust => {
+                if (entrust.data.data.allowEntrust === true) {
                   this.taskEntrustFlag2 = true
+                  if (this.taskEntrustFlag && this.taskEntrustFlag2) {
+                    this.$alert('当前审核部门为' + res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
+                      confirmButtonText: '确定',
+                      callback: action => {
+                        // this.$message({
+                        //   type: 'info',
+                        //   message: `action: ${action}`
+                        // })
                       }
+                    })
+                  }
+                }
+              })
             if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
               res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
               res.data.tAbilityApplicationDTOList[0].applicationScene.map(

front/src/utils/request.js

@@ -161,14 +161,14 @@ instance.interceptors.response.use(
     console.log('接口error', error)
     if (loadingInstance) loadingInstance.close()
 
-    const { response, message } = error
+    const { response, myMessage } = error
     if (error.response) {
       console.log('接口返回', response)
       console.log('接口返回headers', response.headers)
       console.log('接口返回REDIRECT', response.headers.redirect)
       const { status, data } = response
 
-      handleCode(status, data.msg || message, response.headers.redirect)
+      handleCode(status, data.msg || myMessage, response.headers.redirect)
       if (response.headers.token) {
         setAccessToken(response.headers.token)
       }
@@ -179,18 +179,18 @@ instance.interceptors.response.use(
 
       return Promise.reject(error)
     } else {
-      let { message } = error
-      if (message === 'Network Error') {
-        message = '后端接口连接异常'
+      // let { message } = error
+      if (error.message === 'Network Error') {
+        error.message = '后端接口连接异常'
       }
-      if (message.includes('timeout')) {
-        message = '后端接口请求超时'
+      if (error.message.includes('timeout')) {
+        error.message = '后端接口请求超时'
       }
-      if (message.includes('Request failed with status code')) {
-        const code = message.substr(message.length - 3)
-        message = '后端接口' + code + '异常'
+      if (error.message.includes('Request failed with status code')) {
+        const code = error.message.substr(error.message.length - 3)
+        error.message = '后端接口' + code + '异常'
       }
-      message.error(message || `后端接口未知异常`)
+      message.error(error.message || `后端接口未知异常`)
       return Promise.reject(error)
     }
   }

front/src/views/home/AbilityToApplyFor.vue

@@ -126,7 +126,13 @@
     title="已申请摄像头列表"
     @ok="videoVisible = false"
   >
-  <a-select placeholder="请选择归属部门"  v-model:value="deptName" :getPopupContainer="(triggerNode) => triggerNode.parentNode" show-search  option-filter-prop="children" :filterOption="filterOption" @change="deptIdChangeFunction">
+  <a-select placeholder="请选择归属部门" 
+                  style="width: 200px" 
+                  v-model:value="deptName" 
+                   :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                     show-search 
+                     :filterOption="true"  
+                     @change="deptIdChangeFunction">
                     <a-select-option v-for="(item, index) in deptNameAll" :key="`${index}-${item}`" :value="item.name">
                       {{ item.name }}
                     </a-select-option>
@@ -204,6 +210,7 @@
   const showItem = (id, type, delFlag, note1) => {
     if (type == '基础设施') {
       let arr = JSON.parse(note1);
+      //console.log('arrarr====',arr);
       xVideoList.value = []
       arr.map((val) => {
         xVideoList.value.push({
@@ -244,10 +251,6 @@
         })
     } 
       getDeptAllData(); 
-    //select搜索过滤
-    const filterOption = (input, option) => {
-    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-  }
 </script>
 
 <style scoped lang="less">

front/src/views/home/apply.vue

@@ -88,6 +88,9 @@
                     v-else
                     placeholder="请选择归属部门"
                     v-model:value="formName.unit"
+                    :getPopupContainer="(triggerNode) => triggerNode.parentNode" 
+                    show-search 
+                     :filterOption="true" 
                     @change="deptIdChangeFunction"
                   >
                     <a-select-option