修改审批驳回意见输入框高度，审批后自动刷新页面和关闭弹出框

src/views/approval/components/PreviewDisplayDialog.vue

@@ -35,18 +35,21 @@
       </el-tabs>
       <div class="dialog-footer">
         <span v-if="(displayDetail.checkStatus == 0)">
-          <el-button @click.native="handleClose" style="margin-right:6px">取消</el-button>
-          <el-popover placement="top-end" width="400" trigger="click">
+          <el-button @click.native="handleCancel" style="margin-right:6px">取消</el-button>
+          <el-popover placement="top-end" width="400" trigger="manual" v-model="popoverVisible">
             <div>
-              <el-form :model="dialogForm">
+              <el-form :model="dialogForm" prop="remark" :rules="rules" ref="form">
                 <el-form-item label="驳回意见" prop="remark">
-                  <el-input placeholder="驳回意见" v-model="dialogForm.remark" size="small">
-                    <el-button type="primary" slot="append" @click.native="handleCheck(-2)">确定</el-button>
+                  <el-input type="textarea" placeholder="驳回意见" v-model="dialogForm.remark" size="small" :rows="4"
+                    >
                   </el-input>
+                  <el-button type="primary" style="float:right;margin-top:16px" @click.native="handleCheck(-2)"
+                    size="small">确定</el-button>
                 </el-form-item>
               </el-form>
             </div>
-            <el-button slot="reference" type="danger" icon="el-icon-close">驳回</el-button>
+            <el-button slot="reference" type="danger" icon="el-icon-close"
+              @click.native="handleShowPopover">驳回</el-button>
           </el-popover>
           <el-button style="margin-left:6px" type="primary" icon="el-icon-check"
             @click.native="handleCheck(1)">同意</el-button>
@@ -145,7 +148,17 @@ export default {
       },
       activeName: 'page',
       historyChecks: [],
-      dialogLoading: false
+      dialogLoading: false,
+      rules: {
+        remark: [
+          {
+            required: true,
+            message: "请输入驳回意见",
+            trigger: 'blur'
+          }
+        ]
+      },
+      popoverVisible: false
     };
   },
   async mounted() {
@@ -160,20 +173,62 @@ export default {
     },
 
     async handleCheck(checkStatus) {
-      this.dialogLoading = true
-      const params = {
-        sourceId: this.displayDetail.exhibitionId,
-        checkStatus,
-        remark: this.dialogForm.remark,
-        sourceType: 'biz_exhibition',
-        sourceName: this.displayDetail.title
-      }
-      let res = await postCheck(params)
-      if (res.code == 0) {
-        this.$message.success('操作成功！')
+
+      if (checkStatus == -2) {
+        this.$refs.form.validate(async valid => {
+          if (valid) {
+            this.dialogLoading = true
+            const params = {
+              sourceId: this.displayDetail.exhibitionId,
+              checkStatus,
+              remark: this.dialogForm.remark,
+              sourceType: 'biz_exhibition',
+              sourceName: this.displayDetail.title
+            }
+            let res = await postCheck(params)
+            if (res.code == 0) {
+              this.$message.success('操作成功！')
+              this.handleClose()
+              this.$emit('refresh')
+              this.$refs.form.resetFields()
+            }
+            this.dialogLoading = false
+            this.popoverVisible = false
+          }
+        })
+      } else {
+        this.dialogLoading = true
+        const params = {
+          sourceId: this.displayDetail.exhibitionId,
+          checkStatus,
+          remark: this.dialogForm.remark,
+          sourceType: 'biz_exhibition',
+          sourceName: this.displayDetail.title
+        }
+        let res = await postCheck(params)
+        if (res.code == 0) {
+          this.$message.success('操作成功！')
+          this.handleClose()
+          this.$emit('refresh')
+          this.$refs.form.resetFields()
+        }
         this.dialogLoading = false
-        this.handleClose()
+        this.popoverVisible = false
       }
+
+
+    },
+
+    handleShowPopover() {
+      this.popoverVisible = true
+    },
+
+    handleCancel() {
+      this.handleClose()
+      this.$emit('refresh')
+      this.$refs.form.resetFields()
+      this.popoverVisible = false
+      this.dialogLoading = false
     }
   },
 };

src/views/approval/config.js

@@ -2,7 +2,6 @@ export const displayTabletitle = [{
   prop: "title",
   label: "标题",
   columnAlign: 'center',
-  width: 120,
   showOverFlowToolTip: true,
 },
 // {
@@ -14,7 +13,8 @@ export const displayTabletitle = [{
 {
   prop: "deptName",
   label: "展览单位",
-  columnAlign: 'center', showOverFlowToolTip: true,
+  columnAlign: 'center', 
+  showOverFlowToolTip: true,
 },
 {
   prop: "type",

src/views/approval/display.vue

@@ -49,8 +49,12 @@
 
     </el-tabs>
 
-    <PreviewDisplayDialog v-if="Object.keys(curPreviewObj).length > 0" :visible="previewDialogVisible"
-      :displayDetail="curPreviewObj" @handleClose="handleClosePreviewDialog" :loading="previewLoading"/>
+    <PreviewDisplayDialog v-if="Object.keys(curPreviewObj).length > 0" 
+      :visible="previewDialogVisible"
+      :displayDetail="curPreviewObj"  
+      :loading="previewLoading" 
+      @handleClose="handleClosePreviewDialog" 
+      @refresh="loadData" />
 
     <el-image-viewer v-if="imgViewerVisible" :on-close="closeImgViewer" :url-list="imgList" />
   </div>

src/views/display/config.js

@@ -85,6 +85,7 @@ export const title = [{
   prop: "checkRemark",
   label: "审核意见",
   columnAlign: 'center',
+  showOverFlowToolTip: true,
 },
 {
   prop: "themeType",
@@ -94,7 +95,8 @@ export const title = [{
 {
   prop: "remark",
   label: "备注",
-  columnAlign: 'center', showOverFlowToolTip: true,
+  columnAlign: 'center',
+   showOverFlowToolTip: true,
 },
   // {
   //   prop: "images",