原型调整

This commit is contained in:
pan 2024-08-20 15:24:26 +08:00
parent 36ed9848aa
commit a07f109631
12 changed files with 112 additions and 126 deletions

3
.idea/misc.xml generated
View File

@ -3,4 +3,7 @@
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="WebPackConfiguration">
<option name="mode" value="DISABLED" />
</component>
</project>

View File

@ -8,11 +8,11 @@ export function getMessageList(params) {
return Promise.resolve({
total: 5,
rows: [
{ id: 1, msgContent: '测试1111', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' },
{ id: 2, msgContent: '测试2222', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' },
{ id: 3, msgContent: '测试333', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' },
{ id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' },
{ id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' }
{ id: 1, msgContent: '工具名称为00071已发布成功', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' },
{ id: 2, msgContent: '工具名称为00071申请使用已审核通过', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' },
{ id: 3, msgContent: '工具名称为00073已发布成功', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' },
// { id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' },
// { id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' }
],
code: 200,
msg: '操作成功'

View File

@ -21,7 +21,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<!-- <el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="状态"
@ -29,13 +29,13 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
v-for="dict in dict.type.flow_business_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
@ -49,7 +49,7 @@
</el-form-item>
</div>
<div class="sr">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh-left">重置</el-button>
</div>
</div><!--search 默认查询-->
@ -95,8 +95,9 @@
<el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == '0'">正常</el-tag>
<el-tag type="info" v-if="scope.row.status == '1'">禁用</el-tag>
<el-tag type="info" v-if="scope.row.status == '0'">已保存</el-tag>
<el-tag type="info" v-if="scope.row.status == '1'">审核中</el-tag>
<el-tag type="success" v-if="scope.row.status == '2'">已发布</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@ -160,7 +161,7 @@ import toolDetail from "./toolDetail";
export default {
name: "User",
dicts: ['sys_normal_disable', 'tool_type'],
dicts: ['sys_normal_disable', 'tool_type','flow_business_status'],
components: { Treeselect, blUserSelector, toolDetail },
data() {
return {
@ -288,6 +289,7 @@ export default {
/** 查询用户列表 */
getList() {
this.loading = true;
this.queryParams.status = '2'
listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.toolList = response.rows;
this.total = response.total;

View File

@ -7,14 +7,15 @@
<div class="el-form-border">
<el-form ref="form" label-width="150px">
<el-row>
<el-col :span="12"> <el-form-item label="工具编号">0001</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具名称">工具名称2</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具类别">网络工具</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具来源">单位自建</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="负责人">赵宁宇</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="归属单位">人力资源部/员工关系组</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="状态"><span class="green">启用中</span></el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="归属单位">人力资源部</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="状态"><span class="green">在用</span></el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具用途">主要用于单位网络使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="测情况">运行良好可正常使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="测情况">运行良好可正常使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="功能描述">单位网络使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="适用条件">网络正常</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="操作说明">正常开启即可用</el-form-item> </el-col>

View File

@ -15,36 +15,14 @@
</el-form-item>
</div>
<div class="sr">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">5</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</div>
</div>
</el-form>
</el-card>
<el-card class="lrtt">
<div class="lt">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
<div class="divide"></div><!--divide 分隔-->
<el-tree
:data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
</div><!--lt -->
<div class="rt">
<el-card >
<div >
<div class="operate">
<el-button type="primary" @click="markRead(null)">全部标记已读</el-button>
</div><!--operate 操作按钮-->
@ -146,6 +124,7 @@ export default {
getList() {
this.loading = true
getMessageList(this.queryParams).then(response => {
console.info("response============", response)
this.total = response?.total
this.tableList = response?.rows || []
this.loading = false

View File

@ -63,7 +63,7 @@
@click="handleAdd"
v-hasPermi="['system:role:add']"
>新增</el-button>
<el-button
<!-- <el-button
plain
icon="el-icon-edit"
size="mini"
@ -85,7 +85,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
>导出</el-button>-->
</div>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">

View File

@ -85,7 +85,7 @@
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button>
<el-button
<!-- <el-button
plain
icon="el-icon-edit"
size="mini"
@ -103,7 +103,7 @@
>删除</el-button>
<el-button
plain
icon="el-icon-upload2"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
@ -114,7 +114,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
>导出</el-button>-->
</div>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />

View File

@ -29,7 +29,7 @@
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
v-for="dict in dict.type.flow_business_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -91,7 +91,7 @@
>工具发布</el-button>
<!-- <el-button type="primary" icon="el-icon-position">发布</el-button> -->
<!-- <el-button icon="el-icon-thumb" @click="applyUse()">申请使用</el-button> -->
<el-button icon="el-icon-delete">批量删除</el-button>
<!-- <el-button icon="el-icon-delete">批量删除</el-button>-->
<el-button icon="el-icon-download" @click="exoportDrawerOpen = true">导出</el-button>
</div><!--operate 操作按钮-->
<el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
@ -109,8 +109,9 @@
<el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == '0'">正常</el-tag>
<el-tag type="info" v-if="scope.row.status == '1'">禁用</el-tag>
<el-tag type="info" v-if="scope.row.status == '0'">已保存</el-tag>
<el-tag type="info" v-if="scope.row.status == '1'">审核中</el-tag>
<el-tag type="success" v-if="scope.row.status == '2'">已发布</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@ -125,11 +126,11 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button type="text" icon="el-icon-info" @click="applyUse(scope.row)">申请使用</el-button>
<el-button type="text" icon="el-icon-info" @click="applyUse(scope.row)" v-if="scope.row.status == '2'">申请使用</el-button>
<el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
<el-button type="text" icon="el-icon-download">下载</el-button>
<!-- <el-button type="text" icon="el-icon-download" v-if="scope.row.status == '2'">下载</el-button>-->
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['tool:edit', 'tool:remove']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" v-if="scope.row.status == '0'">更多</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleUpdate" icon="el-icon-edit"
v-hasPermi="['tool:edit']">编辑</el-dropdown-item>
@ -153,8 +154,9 @@
<!-- 添加或修改工具信息对话框 -->
<el-drawer :visible.sync="addDrawerOpen" size="75%" @open="openEvent">
<template #title>
<span>新增工具</span>
<span>{{title}}</span>
<div class="drawer-head-btn">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div><!--drawer-head-btn 抽屉顶部按钮区域-->
@ -184,8 +186,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="toolRespDept">
<treeselect v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
<el-form-item label="归属单位" prop="toolRespDept">
<treeselect v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属单位" />
</el-form-item>
</el-col>
@ -205,7 +207,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="工具类别">
<el-select v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
<el-select v-model="form.toolSource" placeholder="请选择工具类别">
<el-option
v-for="dict in dict.type.tool_type"
:key="dict.value"
@ -219,7 +221,7 @@
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
v-for="dict in dict.type.tool_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
@ -269,14 +271,14 @@
</div>
<div class="operate">
<el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
<el-button icon="el-icon-delete">删除</el-button>
<!-- <el-button icon="el-icon-delete">批量删除</el-button>-->
</div><!--operate 操作按钮-->
<el-table :data="docList" style="width: 100%">
<el-table-column type="selection" width="50" align="center"> </el-table-column>
<el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
<el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
<el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
<el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
<el-table-column label="归属单位" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
<el-table-column label="来源" prop="docSource" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
@ -285,12 +287,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handlePriew(scope.row)"
>预览</el-button>
>预览</el-button>-->
<el-button
size="mini"
type="text"
@ -346,9 +348,9 @@
<el-table-column prop="prop5" label="工具类别" ></el-table-column>
<el-table-column prop="prop3" label="归属单位" width="180"> </el-table-column>
<el-table-column prop="prop4" label="负责人" width="100" ></el-table-column>
<el-table-column label="操作" width="100">
<!-- <el-table-column label="操作" width="100">
<el-button type="text">删除</el-button>
</el-table-column>
</el-table-column>-->
</el-table><!--el-table-->
</el-drawer><!--el-drawer 申请使用-->
@ -358,7 +360,7 @@
<span class="title">导出</span>
<div class="drawer-head-btn">
<el-button type="primary">提交</el-button>
<el-button>取消</el-button>
<el-button @click="exoportDrawerOpen = false">取消</el-button>
</div><!--drawer-head-btn 抽屉顶部按钮区域-->
</template>
<div class="el-form-border">
@ -367,18 +369,17 @@
<el-col :span="24">
<el-form-item label="选择需要导出的字段信息">
<el-checkbox-group v-model="checkList1">
<el-checkbox label="A">工具编号</el-checkbox>
<el-checkbox label="A">工具名称</el-checkbox>
<el-checkbox label="B">工具类别</el-checkbox>
<el-checkbox label="C">工具来源</el-checkbox>
<el-checkbox label="D">负责人</el-checkbox>
<el-checkbox label="E">归属单位</el-checkbox>
<el-checkbox label="F">状态</el-checkbox>
<el-checkbox label="G">工具名称</el-checkbox>
<el-checkbox label="H">工具类别</el-checkbox>
<el-checkbox label="I">工具来源</el-checkbox>
<el-checkbox label="J">负责人</el-checkbox>
<el-checkbox label="K">归属单位</el-checkbox>
<el-checkbox label="L">状态</el-checkbox>
<el-checkbox label="G">测试情况</el-checkbox>
<el-checkbox label="H">功能描述</el-checkbox>
<el-checkbox label="I">使用条件</el-checkbox>
<el-checkbox label="J">操作说明</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
@ -413,7 +414,7 @@ import AddDoc from './AddDoc'
export default {
name: "User",
dicts: ['sys_normal_disable', 'tool_type'],
dicts: ['flow_business_status', 'tool_type', 'sys_normal_disable' ,'tool_status'],
components: { Treeselect, blUserSelector, toolDetail, AddDoc },
data() {
return {
@ -437,7 +438,15 @@ export default {
//
deptOptions: undefined,
toolPrincipalsData: [],
tableData2: [],
tableData2: [
{
prop1: '0001',
prop2: '工具名称',
prop3: '归属单位',
prop4: '赵宁宇',
prop5: '工具类别'
}
],
checkList1: [],
toolDetail: {},
//
@ -686,7 +695,7 @@ export default {
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.addDrawerOpen = true;
this.title = "添加工具";
this.title = "申请工具发布";
this.form.password = this.initPassword;
});
},

View File

@ -1,68 +1,58 @@
<template>
<div class="fbox1">
<div class="fl">
<el-tabs v-model="detailActiveName">
<el-tab-pane label="基本信息" name="first">
<div class="app-container">
<!-- <div class="fl">-->
<!-- <el-tabs v-model="detailActiveName">-->
<div class="el-form-border">
<el-form ref="form" label-width="150px">
<div class="box-title">
基本信息
</div>
<el-row>
<el-col :span="12"> <el-form-item label="工具编号">工具编号</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具名称">工具名称2</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具类别">网络工具</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具来源">单位自建</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="负责人">赵宁宇</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="归属单位">人力资源部/员工关系组</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="状态"><span class="green">启用中</span></el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="归属单位">人力资源部</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="状态"><span class="green">在用</span></el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="工具用途">主要用于单位网络使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="测情况">运行良好可正常使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="测情况">运行良好可正常使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="功能描述">单位网络使用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="适用条件">网络正常</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="操作说明">正常开启即可用</el-form-item> </el-col>
<el-col :span="12"> <el-form-item label="备注">工具使用完成后请做好保养工作</el-form-item> </el-col>
</el-row>
</el-form><!--el-form-->
<div>
<div class="box-title">
关联附件
</div>
<el-table :data="docList" style="width: 100%">
<!-- <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
<el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
<el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
<el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
<el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
<el-table-column label="来源" prop="docSource" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button type="text" icon="el-icon-download">下载</el-button>
</template>
</el-table-column>
</el-table><!--el-table-->
</div>
</div><!--el-form-border 表单-->
</el-tab-pane><!--el-tab-pane-->
<el-tab-pane label="关联文件" name="second">
<div class="operate">
<el-button type="primary" icon="el-icon-upload2" @click="handleAdd">上传</el-button>
<el-button icon="el-icon-delete">删除</el-button>
</div><!--operate 操作按钮-->
<el-table :data="docList" style="width: 100%">
<el-table-column type="selection" width="50" align="center"> </el-table-column>
<el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
<el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
<el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
<el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
<el-table-column label="来源" prop="docSource" width="100" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handlePriew(scope.row)"
>预览</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button type="text" icon="el-icon-download">下载</el-button>
</template>
</el-table-column>
</el-table><!--el-table-->
</el-tab-pane><!--el-tab-pane-->
</el-tabs><!--el-tabs-->
<AddDoc :show.sync="open" :toolId="toolDetail.toolId" @callback="getDocList"/>
</div><!--fl 左侧页签-->
<!-- 上传 -->
<AddDoc :show.sync="open" :toolId="toolDetail.toolId" @callback="getDocList"/>
</div><!--fbox1 左右分栏-->
</template>
<script>

View File

@ -1,6 +1,7 @@
<template>
<div class="app-container">
<i-frame :src="workflowProcDefMgrUrl" />
<!-- <i-frame :src="workflowProcDefMgrUrl" />-->
<img class="limg" src="@/assets/images/flow_list.png"/>
</div>
</template>

View File

@ -207,7 +207,7 @@
prop4: '赵宇',
prop5: '网络工具',
},
{
/* {
prop1: '0022',
prop2: '工具名称2',
prop3: '人力资源部/招聘组',
@ -220,7 +220,7 @@
prop3: '人力资源部/薪资组',
prop4: '孙瑶',
prop5: '网络工具',
}
}*/
],
tableData3: [
{

View File

@ -24,7 +24,8 @@
<el-table-column prop="prop5" label="上一环节处理人"></el-table-column>
<el-table-column prop="prop6" label="发起人"></el-table-column>
<el-table-column prop="prop7" label="接收时间"></el-table-column>
<el-table-column label="操作" width="100" >
<el-table-column label="操作" width="120" >
<el-button type="text" icon="el-icon-info" @click="drawer1 = true">审批</el-button>
<el-button type="text" icon="el-icon-info" @click="drawer1 = true">详情</el-button>
</el-table-column>
</el-table><!--el-table-->
@ -258,7 +259,7 @@
prop4: '赵宇',
prop5: '网络工具',
},
{
/*{
prop1: '0022',
prop2: '工具名称2',
prop3: '人力资源部/招聘组',
@ -271,7 +272,7 @@
prop3: '人力资源部/薪资组',
prop4: '孙瑶',
prop5: '网络工具',
}
}*/
],
tableData3: [
{