From c07f9bdc4c0bd9f3b8b17085b49fba31ed2a1f9f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 1 Dec 2022 14:41:32 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/bscatalogue/bscatalogue.vue    | 10 +++++-----
 back/src/views/modules/sys/user.vue              | 16 ++++++++--------
 .../personalCenter/components/PutOnTheShelf .vue | 10 ++++++++--
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/back/src/views/modules/bscatalogue/bscatalogue.vue b/back/src/views/modules/bscatalogue/bscatalogue.vue
index a26999b1..e35fda0a 100644
--- a/back/src/views/modules/bscatalogue/bscatalogue.vue
+++ b/back/src/views/modules/bscatalogue/bscatalogue.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.fanchunxiang
  * @Date: 2021-08-24 10:28:49
- * @LastEditors: hisense.fanchunxiang
- * @LastEditTime: 2021-10-14 17:10:05
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-01 14:32:43
  * @Description: 企业数据 企业卡片
 -->
 <template>
@@ -393,7 +393,7 @@ export default {
                 this.oldId = item.id
               }
             })
-            this.$message.success('删除企业成功！')
+            this.$message.success('删除编目成功！')
             // 删除完退出编辑模式
             this.initTopicCardList()
             this.isRemoveCard = !this.isRemoveCard
@@ -401,8 +401,8 @@ export default {
             this.topicCoverZIndex = this.isEditGroupName ? -999 : 1000
           })
           .catch((e) => {
-            console.log('删除企业失败！%o', e)
-            this.$message.error('删除企业失败！')
+            console.log('删除编目失败！%o', e)
+            this.$message.error('删除编目失败！')
           })
       })
     },
diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue
index e8a9c784..bb68a0c8 100644
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@@ -12,7 +12,7 @@
           <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
         </el-form-item> -->
         <el-form-item label="所属部门">
-          <el-select v-model="dataForm.deptId" :placeholder="$t('infrastructure.department')" clearable>
+          <el-select v-model="dataForm.deptId" :placeholder="$t('infrastructure.department')" clearable filterable >
             <el-option :label="data.name" v-for="data in deptList" :key="data.id" :value="data.id">{{ data.name
             }}</el-option>
           </el-select>
@@ -105,8 +105,8 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
-      //审核权限配置检查
-      checkVisible:false,
+      // 审核权限配置检查
+      checkVisible: false,
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
         getDataListIsPage: true,
@@ -131,14 +131,14 @@ export default {
     this.getDeptList()
   },
   methods: {
-    check(){
-      this.checkVisible=true
-      this.$nextTick(() => {    
+    check () {
+      this.checkVisible = true
+      this.$nextTick(() => {
         this.$refs.check.init()
       })
     },
-    refreshCheck(val){
-      this.checkVisible=val
+    refreshCheck (val) {
+      this.checkVisible = val
     },
     reset () {
       this.dataForm.username = ''
diff --git a/front/src/views/personalCenter/components/PutOnTheShelf .vue b/front/src/views/personalCenter/components/PutOnTheShelf .vue
index b23a28aa..9a1d6825 100644
--- a/front/src/views/personalCenter/components/PutOnTheShelf .vue	
+++ b/front/src/views/personalCenter/components/PutOnTheShelf .vue	
@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-08-02 15:48:15
+ * @LastEditors: Light
+ * @LastEditTime: 2022-12-01 14:02:17
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -51,6 +51,12 @@
     refObj: { type: Object, default: null },
   })
   console.log(props.refObj, '=====================================')
+  const arr = ['算法优势', '应用场景', '计费标准信息', '常见问题', '功能介绍']
+  if (props.refObj.dto.infoList) {
+    props.refObj.dto.infoList = props.refObj.dto.infoList.filter(
+      (val) => arr.indexOf(val.attrType) == -1
+    )
+  }
   const endThis = () => {
     endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
       if (res.data.code == 0) {