ToolTech/tool-tech-front
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修复禅道bug

Browse Source
This commit is contained in:
pan 2024-09-08 23:11:17 +08:00
parent a1a3cec421
commit 937f2826f0
14 changed files with 189 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/document.docx
View File

@ -12,9 +12,7 @@
{docRespDeptName}
文档来源
{docSourceName}
关联工具
{toolName}
上传状态
文档状态
{statusName}
创建时间
{createTime}

16
public/tool.docx
View File

@ -12,16 +12,8 @@
{toolRespDeptName}
状态
{statusName}
工具用途
{toolUse}
测评情况
{testSituation}
功能描述
{functionDesc}
适用条件
{applyCondition}
操作说明
{operateExplain}
备注
{remark}
流程状态
{recordStatusName}
创建时间
{createTime}
{/list}

4
src/api/document/document.js
View File

@ -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
})
}

8
src/components/FileUpload/optimizeToolUpload.vue
View File

@ -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) {

2
src/utils/auth.js
View File

@ -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)

11
src/views/document/detail.vue
View File

@ -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) {

102
src/views/document/index.vue
View File

@ -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;

13
src/views/system/dept/index.vue
View File

@ -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">

14
src/views/system/role/index.vue
View File

@ -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" />

10
src/views/system/user/index.vue
View File

@ -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"

48
src/views/tool/index.vue
View File

@ -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(){

11
src/views/tool/toolDetail.vue
View File

@ -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

6
src/views/workflowList/addWorkflow/tool_release.vue
View File

@ -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);
}
});

39
src/views/workstuff/dispose/index.vue
View File

@ -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);
});
},
// 取消按钮