提交

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -333,7 +333,6 @@
                 :header-cell-style="{'font-weight':'normal'}"
                 highlight-current-row
                 max-height="240"
-                :span-method="objectSpanMethod"
                 style="width: 100%;margin-top:10px;margin-bottom:15px">
                 <el-table-column :label="$t('headerTop.serialNumber')" prop="documentType" min-width="60" align="center">
                     <template slot-scope="scope">
@@ -2002,7 +2001,10 @@ export default {
             taskId
         },res => {
             if(res.code == 'ok'){
-                this.$alert(res.data, '驳回原因');
+                const text = (res.data || []).map(item => {
+                    return `文件【${item.documentName}】的驳回原因为：${item.fileRejectReason}<br/>`
+                })
+                this.$alert(text.join(''), '驳回原因', { dangerouslyUseHTMLString: true });
             }else {
                 this.$message.error(res.msg)
             }

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -806,7 +806,11 @@ import { error } from 'dingtalk-jsapi';
                     taskId
                 },res => {
                     if(res.code == 'ok'){
-                        this.$alert(res.data, '驳回原因');
+                        // this.$alert(res.data, '驳回原因');
+                        const text = (res.data || []).map(item => {
+                            return `文件【${item.documentName}】的驳回原因为：${item.fileRejectReason}<br/>`
+                        })
+                        this.$alert(text.join(''), '驳回原因', { dangerouslyUseHTMLString: true });
                     }else {
                         this.$message.error(res.msg)
                     }