From 567b4fbb2e0fb35f78c50cfc1c7919581dee0696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 12 May 2023 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../problemKnowledgeBaseRelease.vue           | 83 ++++++++++++++++---
 .../components/monthlyReportRegulations.vue   |  2 +-
 4 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b91a8764e..55e9ecbe5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1833,4 +1833,5 @@ module.exports = {
   masterProject:'Master Project',
   deliveryTime:'Delivery Time',
   expectedDeliveryTime:'Expected Delivery Time',
+  changeAuthor:'Change Author',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 73a1e186f..e9e2d3a19 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1934,4 +1934,5 @@ module.exports = {
   masterProject:'主项目',
   deliveryTime:'交付时间',
   expectedDeliveryTime:'预计交付时间',
+  changeAuthor:'更改作者',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index 113b01301..eb649c5ee 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -12,9 +12,9 @@
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content" style="padding: 30px">
           <div class="search-detail-wrap">
-            <a-form layout="inline" style="width: 1200px;margin: 0 auto" @keyup.enter.native="onSearch">
+            <a-form layout="inline" @keyup.enter.native="onSearch">
               <a-row :gutter="24">
-                <a-col :span="10">
+                <a-col :span="6">
                   <div class="box-title-text">
                     <div class="title-text" :title="$t('searchContent')">
                       <span>{{$t('searchContent')}}</span>
@@ -23,7 +23,7 @@
                              v-model="queryParam.searchStr"></a-input>
                   </div>
                 </a-col>
-                <a-col :span="10">
+                <a-col :span="6">
                   <div class="box-title-text">
                     <div class="title-text" :title="$t('releaseStatus')">
                       <span>{{$t('releaseStatus')}}</span>
@@ -40,10 +40,29 @@
                     </a-select>
                   </div>
                 </a-col>
+                <a-col :span="6">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('displayPermission')">
+                      <span>{{$t('displayPermission')}}</span>
+                    </div>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('displayPermission')"
+                              v-model="queryParam.showPermissions">
+                      <a-select-option v-for="(item, key) in projectNameList"
+                                       :key="key"
+                                       :value="item.value">
+                     <span class="selectText" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
+                  </div>
+                </a-col>
                 <div style="text-align: right">
                   <a-button class="box-button" @click="ResetSearch">{{$t('reset')}}
                   </a-button>
-                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="onSearch">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="onSearch">
+                    {{$t('query')}}
+                  </a-button>
                 </div>
               </a-row>
             </a-form>
@@ -75,6 +94,8 @@
                     {{item.createBy}}
                   </div>
                   <div class="text-text-right-text">
+                    <a style="margin-right: 10px" @click="changeAuthorClick(item)"
+                       v-if="administrators">{{$t('changeAuthor')}}</a>
                     <a style="margin-right: 10px" @click="edit(item)"
                        v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
                     <a @click="deleteData(item)"
@@ -103,15 +124,21 @@
       </div>
       <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
     </div>
+    <SelectedBy ref="SelectedByRef" :isSingleChoice="true"
+                :title="$t('changeAuthor')" @SelectedByForm="SelectedByForm"></SelectedBy>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import SelectedBy from '@/components/SelectedBy/index'
   import { mapGetters } from 'vuex'
 
   export default {
     name: 'problemKnowledgeBaseRelease',
+    components: {
+      SelectedBy
+    },
     data() {
       return {
         checkboxText: [],
@@ -129,14 +156,26 @@
             value: 'Have released'
           }
         ],
+        projectNameList: [
+          {
+            value: 'Open',
+            name: this.$t('OpenOne')
+          },
+          {
+            value: 'Privacy',
+            name: this.$t('Privacy')
+          }
+        ],
         loading: false,
         administrators: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         pageNo: 1,
         userInfoQuery: {},
+        formInline: {},
         url: {
           getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page',
-          deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseEO/deleteBatch'
+          deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseEO/deleteBatch',
+          edit: '/problemKnowledgeBase/problemKnowledgeBaseEO/edit'
         }
       }
     },
@@ -155,6 +194,28 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      changeAuthorClick(item) {
+        this.formInline = item
+        this.$refs.SelectedByRef.getPush()
+      },
+      //转办接口
+      SelectedByForm(userIds, name) {
+        let query = {
+          createBy: name,
+          id: this.formInline.id
+        }
+        putAction(this.url.edit, query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.SelectedByRef.visible = false
+            this.$refs.SelectedByRef.submitLoading = false
+            this.getList()
+          } else {
+            this.$refs.SelectedByRef.submitLoading = false
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
+      },
       pageOnChange(page, pageSize) {
         this.pageNo = page
         this.getList()
@@ -252,7 +313,7 @@
 </script>
 
 <style scoped lang="less">
-  @import'~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 
   .doc-detail {
     background: #fff;
@@ -328,7 +389,7 @@
 
   .text-text-right {
     padding: 19px 19px;
-    width: calc(100% - 540px);
+    width: calc(100% - 570px);
     box-sizing: border-box;
     /*margin-left: 38px;*/
   }
@@ -338,7 +399,7 @@
     height: 100%;
     text-align: center;
     position: absolute;
-    right: 300px;
+    right: 330px;
     top: 50%;
     transform: translate-Y(-50%);
   }
@@ -348,7 +409,7 @@
     height: 100%;
     text-align: center;
     position: absolute;
-    right: 420px;
+    right: 450px;
     top: 50%;
     transform: translate-Y(-50%);
   }
@@ -358,13 +419,13 @@
     height: 100%;
     text-align: center;
     position: absolute;
-    right: 180px;
+    right: 210px;
     top: 50%;
     transform: translate-Y(-50%);
   }
 
   .text-text-right-text {
-    width: 180px;
+    width: 210px;
     height: 100%;
     text-align: center;
     position: absolute;
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index a6caefcff..00b2ddae9 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="monthlyReportRegulations-box">
     <div class="header-text">
-      <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
+      <div class="header-text-left">{{this.$t('problemKnowledgeBase')}}</div>
       <div class="header-text-right" @click="moreClick">
         More
         <img src="../../../assets/gengduo.png" alt="">