Merge remote-tracking branch 'origin/fix_20230609' into fix_20230609

jero-web/src/common/lang/en-us.js

@@ -1848,4 +1848,6 @@ module.exports = {
   approvalcycle:'Approval cycle(day)',
   transittime:'Transit Time',
   returntime:'Return time',
+  copyLink:'Copy link',
+  successfulReplication:'Successful replication',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1949,4 +1949,6 @@ module.exports = {
   approvalcycle:'审批周期(天)',
   transittime:'通过时间',
   returntime:'退回时间',
+  copyLink:'复制链接',
+  successfulReplication:'复制成功',
 }

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -30,7 +30,7 @@
             <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
           </a>
       </span>
-      </div>
+        </div>
       </div>
       <div class="box-content-content">
         <div class="box-content-content-index"
@@ -127,6 +127,10 @@
               </div>
             </div>
             <div class="content-box-button-right">
+              <div class="content-box-button-text" @click="copyLinkClick(item)">
+                <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+                {{$t('copyLink')}}
+              </div>
               <div class="content-box-button-text" @click="pushJump(item)">
                 <img src="~/@assets/feishu.png" alt="" class="jumpicon">
                 {{$t('contactTheFounder')}}
@@ -424,9 +428,9 @@
         this.queryForm = row
         this.$refs.SelectedByRef.getPush()
       },
-      pushJump(row){
+      pushJump(row) {
         let query = {
-          userName: row.createBy,
+          userName: row.createBy
         }
         postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
           if (res.code === 200) {
@@ -465,6 +469,12 @@
       },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }
@@ -476,10 +486,12 @@
     overflow: hidden;
     /*margin: 0 auto;*/
   }
-  .jumpicon{
+
+  .jumpicon {
     height: 13.72px;
     width: 15.44px;
   }
+
   .box-title-text {
     line-height: 1.4;
     width: 360px;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue

@@ -53,6 +53,10 @@
           </div>
         </div>
         <div class="content-box-button-right">
+          <div class="content-box-button-text" @click="copyLinkClick(queryForm)">
+            <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+            {{$t('copyLink')}}
+          </div>
           <div class="content-box-button-text" @click="pushJump(queryForm)">
             <img src="~/@assets/feishu.png" alt="" class="jumpicon">
             {{$t('contactTheFounder')}}
@@ -493,6 +497,12 @@
             this.$refs.SelectedByRef.submitLoading = false
           }
         })
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -2802,6 +2802,7 @@
               if (this.updateFlowStatusList && this.updateFlowStatusList.length > 0) {
                 this.updateFlowStatusBatch()
               }
+              this.completeTaskList = []
               for (let i = 0; i < this.startProcessList.length; i++) {
                 if (this.startProcessList[i].type == 2) {
                   this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate
@@ -2829,6 +2830,7 @@
             Promise.all(this.completeTaskList).then((res) => {
               if (this.requestsNum == res.length) {
                 this.visible = false
+                this.formInline = {}
                 this.selectedRowKeys = []
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.confirmLoading = false