From 937f2826f0b215e6c4bcfada59087a3771d211ee Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sun, 8 Sep 2024 23:11:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=A6=85=E9=81=93b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/document.docx                          | Bin 12579 -> 12494 bytes
 public/tool.docx                              | Bin 12905 -> 12633 bytes
 src/api/document/document.js                  |   4 +-
 .../FileUpload/optimizeToolUpload.vue         |   8 +-
 src/utils/auth.js                             |   2 +-
 src/views/document/detail.vue                 |  11 +-
 src/views/document/index.vue                  | 102 ++++++++++++++----
 src/views/system/dept/index.vue               |  13 ++-
 src/views/system/role/index.vue               |  14 ++-
 src/views/system/user/index.vue               |  10 +-
 src/views/tool/index.vue                      |  48 ++++++---
 src/views/tool/toolDetail.vue                 |  11 +-
 .../workflowList/addWorkflow/tool_release.vue |   6 +-
 src/views/workstuff/dispose/index.vue         |  39 ++++---
 14 files changed, 189 insertions(+), 79 deletions(-)

diff --git a/public/document.docx b/public/document.docx
index fbb77ff481d2fadd92ed51b70e13b75f780b96ae..2a0622e3da409e12cb3f384421575de8a7e77363 100644
GIT binary patch
delta 4605
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

delta 4710
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

diff --git a/public/tool.docx b/public/tool.docx
index 3ced47fb14150b51f08e5a4130fbf8d9a9ec5d90..c03eb7863f4f3a63e5d5bca2cdad3afeffa78faa 100644
GIT binary patch
delta 4362
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
E0Q#af5C8xG

delta 4635
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
RH~~PDD={brgDwC7001w@)#m^J

diff --git a/src/api/document/document.js b/src/api/document/document.js
index 5974d65..cec496c 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -68,7 +68,7 @@ export function getStatistics(query) {
 export function getExportWordList(query) {
   return request({
     url: '/document/export/word/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 9c33613..b9cdac6 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -491,9 +491,11 @@ export default {
           failCount++;
         }
       }
-      this.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
-      this.progressFlag = false;
-      this.progressPercent = 0;
+      setTimeout(function () {
+        self.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
+        self.progressFlag = false;
+        self.progressPercent = 0;
+      }, 500);
     },
     updateProgress() {
       if (this.uploadedCount === this.totalFiles) {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 08a43d6..df9f40a 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Admin-Token-Tool'
 
 export function getToken() {
   return Cookies.get(TokenKey)
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index cbf8fa8..153aaa8 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -83,7 +83,7 @@
                   <div class="ltext">
                     <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
                     <div class="te">{{repItem.content}}</div>
-                    <!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                                        <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                                         <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
                                           <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
                                           <div class="plbtn">
@@ -91,7 +91,7 @@
                                             <el-divider direction="vertical"></el-divider>
                                             <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
                                           </div>
-                                        </div>-->
+                                        </div>
                   </div>
                 </div>
               </template>
@@ -414,15 +414,14 @@
             });
             self.cancelReplySon(parentIndex, repIndex)
             self.getDiscussionsList()
+            // 清空回复内容并隐藏表单
+            this.$set(parentItem.replyContentSon, repIndex, '');
+            this.$set(parentItem.showReplyFormSon, repIndex, false);
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
           });
         })
-
-        // 清空回复内容并隐藏表单
-        this.$set(parentItem.replyContentSon, repIndex, '');
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
       /** 回复 **/
       submitReply(index, item) {
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 5d1e9d9..8d738f9 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -86,17 +86,33 @@
     </el-card>
     <el-card class="lrtt">
       <div class="lt">
-        <el-input placeholder="请输入..." prefix-icon="el-icon-search"></el-input>
+        <el-input
+          v-model="categoryNameParam"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          prefix-icon="el-icon-search"
+          style="margin-bottom: 20px"
+        />
+<!--        <el-input placeholder="请输入..." prefix-icon="el-icon-search"
+                  clearable size="small" style="margin-bottom: 20px"
+                  v-model="categoryNameParam"></el-input>-->
         <div class="divide"></div><!--divide 分隔-->
-        <el-tree :data="docCategory" :props="docCategoryProps" @node-click="handleNodeClick">
+        <el-tree :data="docCategory" :props="docCategoryProps"
+                 ref="tree" :expand-on-click-node="false"
+                 :filter-node-method="filterNode"
+                 node-key="id"
+                 default-expand-all
+                 highlight-current
+                 @node-click="handleNodeClick">
 					<span class="custom-tree-node" slot-scope="{ node, data }">
 					    <span>{{ node.label }}</span>
                 <el-dropdown>
                   <span class="el-dropdown-link"><i class="el-icon-more"></i></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item  @click.native="handleDocCategoryAdd(data)"><i class="el-icon-plus"></i>添加</el-dropdown-item>
-                    <el-dropdown-item v-if="data.types != 'system'" @@click.native="handleDocCategoryUpdate(data)"><i class="el-icon-edit"></i>编辑</el-dropdown-item>
-                    <el-dropdown-item v-if="data.types != 'system'" @@click.native="handleDocCategoryDelete(data)"><i class="el-icon-delete"></i>删除</el-dropdown-item>
+                    <el-dropdown-item v-if="data.types != 'system'" @click.native="handleDocCategoryUpdate(data)"><i class="el-icon-edit"></i>编辑</el-dropdown-item>
+                    <el-dropdown-item v-if="data.types != 'system'" @click.native="handleDocCategoryDelete(data)"><i class="el-icon-delete"></i>删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
           </span>
@@ -120,7 +136,7 @@
 
         </div><!--operate 操作按钮-->
 
-        <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="docList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="文档编号"  prop="docCode" width="120" />
           <el-table-column label="文档名称"  prop="docName" :show-overflow-tooltip="true" />
@@ -209,8 +225,11 @@
 
 
 
-    <el-dialog :title="docCategoryTitle" :visible.sync="docCategoryOpen"  width="50%" append-to-body>
-      <el-form ref="docCategoryForm" :model="docCategoryForm" :rules="docCategoryRules" label-width="80px">
+    <el-dialog :title="docCategoryTitle" :visible.sync="docCategoryOpen"  width="50%"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
+      <el-form ref="docCategoryFormRefs" :model="docCategoryForm" :rules="docCategoryRules" label-width="80px">
         <el-form-item label="父分类" prop="parentId">
           <treeselect v-model="docCategoryForm.parentId" :options="docCategory" :show-count="true" placeholder="如果不选择，默认为顶级节点" />
         </el-form-item>
@@ -269,6 +288,7 @@
     <el-dialog :title="exportTitle" :visible.sync="exportDrawerOpen"
                :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               v-loading="wordLoading"  element-loading-text="正在下载数据，请稍候"
                width="980px" append-to-body>
       <div class="el-form-border">
           <el-form ref="exportFrom" label-width="180px">
@@ -292,7 +312,7 @@
                   <el-checkbox label="docCode">文档编号</el-checkbox>
                   <el-checkbox label="docName">文档名称</el-checkbox>
                   <el-checkbox label="docType">文档类别</el-checkbox>
-                  <el-checkbox label="docPrincipals">负责人</el-checkbox>
+                  <el-checkbox label="docPrincipalsName">负责人</el-checkbox>
                   <el-checkbox label="docRespDeptName">归属单位</el-checkbox>
                   <el-checkbox label="docSource">文档来源</el-checkbox>
                   <el-checkbox label="docStatus">文档状态</el-checkbox>
@@ -397,11 +417,17 @@ export default {
         docPrincipals: '',
         docSource: '',
         docStatus: '',
-        docCategoryId: '',
         createById: this.$store.getters.userId,
         permissionCheck: true,
         downloadCheck:true
       },
+      // 文件夹查询
+      queryCategoryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        docCategoryId: '',
+        categoryName: '',
+      },
       // 表单参数
       form: {
         docName: '',
@@ -444,7 +470,7 @@ export default {
       loadingDownload: false,
       acceptType: "zip,rar,7z",
       //导出属性
-      columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'docStatus', 'createTime'],
+      columnList: ['docCode', 'docName', 'docType', 'docPrincipalsName', 'docRespDeptName', 'docSource', 'docStatus', 'createTime'],
       checkList: [],
       exportDrawerOpen: false,
       docTitle: '',
@@ -475,8 +501,16 @@ export default {
       docDetail: {},
       detailDocOpen: false,
       detailOpen: false,
+      categoryNameParam: undefined,
+      wordLoading: false,
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    categoryNameParam(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
     this.getDeptTree();
@@ -529,6 +563,7 @@ export default {
       this.dateRange = [];
       this.queryParams.docCategoryId = '';
       this.resetForm("queryForm");
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -634,17 +669,20 @@ export default {
     },
     /** 修改按钮操作 */
     handleDocCategoryUpdate(row) {
-      this.resetDocCategoryForm();
+      let self = this
+      self.docCategoryOpen = true;
+      self.$nextTick(() => {
+        self.resetDocCategoryForm();
+      })
       const id = row.id;
       getCategory(id).then(response => {
-        this.docCategoryForm = response.data;
-        this.docCategoryOpen = true;
-        this.docCategoryTitle = "修改文档资源分类";
+        self.docCategoryForm = response.data;
+        self.docCategoryTitle = "修改文档资源分类";
       });
     },
     /** 提交按钮 */
     docCategorySubmitForm() {
-      this.$refs["docCategoryForm"].validate(valid => {
+      this.$refs["docCategoryFormRefs"].validate(valid => {
         if (valid) {
           if (this.docCategoryForm.id != null) {
             updateCategory(this.docCategoryForm).then(response => {
@@ -670,7 +708,12 @@ export default {
     },
     /** 重置 **/
     resetDocCategoryForm(){
-      this.$refs.docCategoryForm.resetFields();
+      this.docCategoryForm = {
+          categoryName: null,
+          categoryDescription: null,
+          parentId: null
+      },
+      this.$refs.docCategoryFormRefs.resetFields();
     },
     /**
      * 处理下载
@@ -772,6 +815,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let self = this
+      console.info("this.checkList.======", this.checkList)
+      if(this.checkList.length == 0){
+        this.$modal.msgWarning(`最少选择一个字段`);
+        return
+      }
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
 
@@ -787,7 +835,7 @@ export default {
             excludeFields:excludeFields,
           }
         }
-        this.download('/document/export', params , `文档资源信息数据_${new Date().getTime()}.xlsx`)
+        this.download('/document/export', params , `document_${new Date().getTime()}.xlsx`)
       }
       if (this.statevalue == 2) {
         let params = {
@@ -798,16 +846,30 @@ export default {
             docIdList: self.selection.map(item=>item.docId)
           }
         }
+        self.wordLoading = true
         getExportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
               form: null,
               list: r.data
             }
-            exportDocx('document.docx', data, `document.docx`)
+            exportDocx('document.docx', data, `document_${new Date().getTime()}.docx`)
+            setTimeout(() => {
+              if(self.batchExportFlag){
+                self.clearSelected()
+              }
+              self.wordLoading = false
+              self.exoportDrawerOpen = false;
+            }, 1000);
           } else {
+            self.wordLoading = false
+            self.exportDrawerOpen = false
             this.$message.error('没有数据');
           }
+        }).catch((err) => {
+          console.error("err=============", err)
+          self.wordLoading = false
+          self.exportDrawerOpen = false
         })
       }
 
@@ -834,6 +896,10 @@ export default {
           break;
       }
     },
+    clearSelected() {
+      // 清空选中的tab
+      this.$refs.tableRef.clearSelection();
+    },
     /** 关闭详情 **/
     handleFileCloseDetail(){
       this.fileDetailDrawerOpen = false;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e0cc845..8061e9e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -100,7 +100,10 @@
     </el-card>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
@@ -112,7 +115,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -124,19 +127,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" show-word-limit/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d4d7b78..fcba135 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -154,10 +154,13 @@
     </el-card>
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px"
+               append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" maxlength="50" show-word-limit/>
         </el-form-item>
         <el-form-item prop="roleKey">
           <span slot="label">
@@ -166,7 +169,7 @@
             </el-tooltip>
             权限字符
           </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" maxlength="70" show-word-limit/>
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
@@ -206,7 +209,10 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a294b3d..bbd6910 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -188,7 +188,10 @@
     </el-card>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -294,7 +297,10 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 1229c36..71e36bc 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -96,15 +96,15 @@
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
-          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"  width="150px"/>
+          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"  width="150px" :show-overflow-tooltip="true"/>
           <el-table-column label="工具名称"  key="toolName" prop="toolName" :show-overflow-tooltip="true" width="150px"/>
           <el-table-column label="工具类别"  key="toolType" prop="toolType" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
+          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" :show-overflow-tooltip="true"/>
           <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" :show-overflow-tooltip="true" />
-          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
           <el-table-column label="状态" align="center" key="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
@@ -162,7 +162,7 @@
             <template slot-scope="scope">
 <!--              && !scope.row.downloadStatus v-if="checkApplyUseBtn(scope.row)"-->
               <el-button type="text" icon="el-icon-info"  @click="applyUse(scope.row)" v-if="checkApplyUseBtn(scope.row)">申请使用</el-button>
-              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
+              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)" v-hasPermi="['tool:detail']">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
@@ -185,8 +185,11 @@
     </el-card><!--el-card-->
 
     <!-- 工具导出对话框 -->
-    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
-               :show-close="false" :wrapperClosable="false">
+    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px"
+               append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               v-loading="wordLoading"  element-loading-text="正在下载数据，请稍候"
+    >
       <div class="el-form-border">
         <el-form ref="exportFrom" label-width="180px">
           <el-row>
@@ -212,12 +215,14 @@
                   <el-checkbox label="toolPrincipalsName">负责人</el-checkbox>
                   <el-checkbox label="toolRespDeptName">归属单位</el-checkbox>
                   <el-checkbox label="status">状态</el-checkbox>
-                  <el-checkbox label="toolUse">工具用途</el-checkbox>
-                  <el-checkbox label="testSituation">测评情况</el-checkbox>
+                  <el-checkbox label="recordStatus">流程状态</el-checkbox>
+                  <el-checkbox label="createTime">创建时间</el-checkbox>
+<!--                  <el-checkbox label="toolUse">工具用途</el-checkbox>-->
+<!--                  <el-checkbox label="testSituation">测评情况</el-checkbox>
                   <el-checkbox label="functionDesc">功能描述</el-checkbox>
                   <el-checkbox label="applyCondition">适用条件</el-checkbox>
                   <el-checkbox label="operateExplain">操作说明</el-checkbox>
-                  <el-checkbox label="remark">备注</el-checkbox>
+                  <el-checkbox label="remark">备注</el-checkbox>-->
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
@@ -290,6 +295,7 @@ import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
 import { exportDocx } from '@/utils/docUtil/docutil.js';
 import { addCount } from "@/api/tool/downloadCount";
+import { Loading, Message } from 'element-ui'
 
 export default {
   name: "User",
@@ -323,7 +329,8 @@ export default {
       // 部门树选项
       deptOptions: undefined,
       toolPrincipalsData: [],
-      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'],
+      //'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'
+      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'recordStatus','createTime'],
       checkList: [],
       toolDetail: {},
       // 是否显示弹出层
@@ -409,6 +416,7 @@ export default {
       exportTitle:'',
       batchExportFlag: false,
       selectedRows: [], // 保存所有选中的数据
+      wordLoading: false,
 
     };
   },
@@ -623,6 +631,10 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let self = this
+      if(this.checkList.length == 0){
+        this.$modal.msgWarning(`最少选择一个字段`);
+        return
+      }
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
         let params = {
@@ -637,7 +649,7 @@ export default {
             excludeFields:excludeFields,
           }
         }
-        this.download('/tool/export',params, `工具信息数据_${new Date().getTime()}.xlsx`)
+        this.download('/tool/export',params, `tool_${new Date().getTime()}.xlsx`)
         setTimeout(() => {
           if(self.batchExportFlag){
             self.clearSelected()
@@ -654,6 +666,8 @@ export default {
             toolIdList: self.selection.map(item=>item.toolId)
           }
         }
+        self.wordLoading = true
+        // 正在下载数据，请稍候
         exportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
@@ -661,16 +675,22 @@ export default {
               list: r.data
             }
             //模板文件位置在public文件夹里N
-            exportDocx('tool.docx', data, `tool.docx`)
+            exportDocx('tool.docx', data, `tool_${new Date().getTime()}.docx`)
             setTimeout(() => {
               if(self.batchExportFlag){
                 self.clearSelected()
               }
+              self.wordLoading = false
               self.exoportDrawerOpen = false;
             }, 1000);
           } else {
+            self.wordLoading = false
             this.$message.error('没有数据');
           }
+        }).catch((err) => {
+          console.error("err=============", err)
+          self.wordLoading = false
+          self.exoportDrawerOpen = false;
         })
       }
 
@@ -714,7 +734,7 @@ export default {
         return
       }
 
-      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('该流程待办任务将会被撤销，请谨慎操作。是否确认执行？')
         .then(async() => {
           _this.loading = true
           for (let row of list) {
@@ -733,13 +753,13 @@ export default {
             }
             await addTool(formData)
           }
-          _this.$modal.msgSuccess("删除成功");
+          _this.$modal.msgSuccess("撤销成功");
           _this.loading = false
           _this.getList();
         })
     },
     selectable(row,index){
-      return row.recordStatus==='draft'&&row.createBy==this.userInfo.userId
+      return row.recordStatus==='draft' && row.createBy == this.userInfo.userId
     },
     /** 关闭详情 **/
     handleCloseDetail(){
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 157deec..8805bf2 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -109,7 +109,7 @@
                   <div class="ltext">
                     <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
                     <div class="te">{{repItem.content}}</div>
-<!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                     <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
                       <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
                       <div class="plbtn">
@@ -117,7 +117,7 @@
                         <el-divider direction="vertical"></el-divider>
                         <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
                       </div>
-                    </div>-->
+                    </div>
                   </div>
                 </div>
               </template>
@@ -477,15 +477,14 @@
             });
             self.cancelReplySon(parentIndex, repIndex)
             self.getDiscussionsList()
+            // 清空回复内容并隐藏表单
+            this.$set(parentItem.replyContentSon, repIndex, '');
+            this.$set(parentItem.showReplyFormSon, repIndex, false);
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
           });
         })
-
-        // 清空回复内容并隐藏表单
-        this.$set(parentItem.replyContentSon, repIndex, '');
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
       handleBeforeClose() {
         this.viewDialogOpen = false
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index ca983ab..b97c296 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -437,7 +437,7 @@ export default {
       if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
         checkToolExist({toolId:_this.form.toolId,toolCode:_this.form.toolCode,toolRespDept:_this.form.toolRespDept}).then((response) => {
           if (response.data) {
-            callback(new Error(_this.form.toolRespDeptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
+            callback(new Error(_this.userInfo.dept.deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
           } else {
             callback()
           }
@@ -808,7 +808,7 @@ export default {
     },
     deleteForm(){
       let _this = this
-      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('该流程待办任务将会被撤销，请谨慎操作。是否确认执行？')
         .then(()=> {
           _this.loading = true
           let formData = {
@@ -826,7 +826,7 @@ export default {
           }
           addTool(formData).then((res) => {
             if (res.code === 200) {
-              this.$modal.msgSuccess("删除成功");
+              this.$modal.msgSuccess("撤销成功");
               this.close(true);
             }
           });
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 8c2b3d3..2fa2212 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -9,7 +9,7 @@
             </el-form-item>
           </div>
           <div class="sr">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-loading="loading">搜索</el-button>
             <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
           </div>
         </div><!--search 搜索-->
@@ -244,28 +244,37 @@ export default {
     },
     /** 查询列表 */
     getListData() {
-      this.loading = true;
-      this.postList = [];
-      workflowToDoList(this.queryParams).then((response) => {
-        if (this.activeName == "taskToDo") {
+      let self = this
+      self.loading = true;
+      self.postList = [];
+      workflowToDoList(self.queryParams).then((response) => {
+        if (self.activeName == "taskToDo") {
           // 待办
-          this.statustotal = response.data.totalCount;
+          self.statustotal = response.data.totalCount;
           // this.$store.commit("SET_THINGNUMBER", response.data.totalCount || 0);
-          this.total = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
-        if (this.activeName == "taskDealed") {
+        if (self.activeName == "taskDealed") {
           // 已办
-          this.doneTotal = response.data.totalCount;
-          this.total = response.data.totalCount;
+          self.doneTotal = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
-        if (this.activeName == "taskFinish") {
+        if (self.activeName == "taskFinish") {
           // 办结
-          this.finishedTotal = response.data.totalCount;
-          this.total = response.data.totalCount;
+          self.finishedTotal = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
 
-        this.postList = response.data.result;
-        this.loading = false;
+        self.postList = response.data.result;
+        setTimeout(function () {
+          self.loading = false;
+        }, 500);
+
+      }).catch(err => {
+        console.info("err=============", err)
+        setTimeout(function () {
+          self.loading = false;
+        }, 500);
       });
     },
     // 取消按钮