Browse Source

task-5449 受控文件发放,查阅

tianxinyu 5 months ago
parent
commit
c61c1627af

+ 1 - 0
src/business/platform/data/templaterender/utils/JDialogTemplate.js

@@ -28,6 +28,7 @@ _.extend(JDialog, {
     _init: function (template) {
         if (this._isInitialization) return
         this.$template = template
+        this.$message = template.$message
         this.$vue = Vue
         this.$request = request
         this.$dialog = dialog

+ 1 - 0
src/business/platform/data/templaterender/utils/JTemplate.js

@@ -28,6 +28,7 @@ _.extend(JTemplate, {
     _init: function (template) {
         if (this._isInitialization) return
         this.$template = template
+        this.$message = template.$message
         this.$vue = Vue
         this.$request = request
         this.$dialog = dialog

+ 1 - 0
src/business/platform/form/utils/JForm.js

@@ -30,6 +30,7 @@ _.extend(JForm, {
         if (this._isInitialization) return
         this.$form = form
         this.$vue = Vue
+        this.$message = form.$message
         this.$request = request
         this.$dialog = dialog
         this.$common = common

+ 8 - 1
src/views/component/fileTraining/index.vue

@@ -64,7 +64,7 @@
                             @click.stop.native="toggleActive(activity, index)"
                         >
                             <div>
-                                <el-tooltip class="itemStyle" effect="dark" placement="right-end" :content="showContent(activity,index)">
+                                <el-tooltip class="itemStyle" effect="dark" popper-class="tooltip-max-width" placement="right" :content="showContent(activity,index)">
                                     <div>版本号:{{ activity.xiu_ding_ban_ben_ || activity.ban_ben_ }}/修订人:{{ getUserName(activity.bian_zhi_ren_) }}</div>
                                 </el-tooltip>
                             </div>
@@ -519,6 +519,13 @@ export default {
 }
 </script>
 <style lang="scss">
+    .tooltip-max-width{
+      max-width: 1200px !important;
+      width: max-content;
+      white-space: pre-wrap;
+      word-break: break-all;
+      padding: 8px 12px;
+    }
     .ibps-file-preview-dialog {
       width: 80%;
       z-index:99999;

+ 4 - 1
src/views/platform/message/inner/detail/dialog.vue

@@ -198,10 +198,13 @@ export default {
                         this.$common.request('add', returnParams).then(() => { console.log('确认接收到发放文件') }).then(() => {
                             this.type = ''
                             this.getFormData()
+                            this.closeDialog()
                         })
+                    }else{
+                      this.closeDialog()
                     }
                 })
-                this.closeDialog()
+                // this.closeDialog()
             }).catch(() => { })
         },
         handleCallback (res) {