zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
shijing 2024-08-13 11:15:08 +08:00
parent 7172a0e070 147c5273f1
commit a5759b48b3
6 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/model/wf.js
View File

@ -168,7 +168,7 @@ export default {
}, },
dutyAgg: { dutyAgg: {
url: `${config.API_URL}/wf/ticket/duty_agg/`, url: `${config.API_URL}/wf/ticket/duty_agg/`,
name: "工单待办聚合", name: "待办审批聚合",
req: async function(data){ req: async function(data){
return await http.get(this.url, data); return await http.get(this.url, data);
} }

190
src/config/route.js
View File

@ -134,6 +134,101 @@ const routes = [
}, },
], ],
}, },
//审批
{
name: "wf",
path: "/wf",
meta: {
title: "审批管理",
icon: "sc-icon-Shenpi",
type: "menu",
perms: ["wf"],
},
children: [
{
name: "workflow",
path: "/wf/workflow",
meta: {
title: "工作流",
// icon: "el-icon-guide",
perms: ["workflow"],
},
component: "wf/workflow",
},
{
name: "configuration",
path: "/wf/configuration",
meta: {
title: "工作流配置",
// icon: "el-icon-menu",
hidden: true,
perms: ["workflow"],
},
component: "wf/configuration",
},
{
name: "allwork",
path: "/wf/allwork",
meta: {
title: "全部审批",
// icon: "el-icon-folder",
perms: ["allwork"],
},
component: "wf/allwork",
},
{
name: "ownerwork",
path: "/wf/ownerwork",
meta: {
title: "我创建的",
// icon: "el-icon-folder-add",
perms: ["ownerwork"],
},
component: "wf/ownerwork",
},
{
name: "duty",
path: "/wf/dutywork",
meta: {
title: "待办审批",
// icon: "el-icon-folder-opened",
perms: ["duty"],
},
component: "wf/dutywork",
},
{
name: "worked",
path: "/wf/worked",
meta: {
title: "我处理的",
// icon: "el-icon-expand",
perms: ["worked"],
},
component: "wf/worked",
},
{
name: "ccwork",
path: "/wf/ccwork",
meta: {
title: "抄送我的",
// icon: "el-icon-edit-pen",
perms: ["ccwork"],
},
component: "wf/ccwork",
},
{
name: "ticketdetail",
path: "/wf/ticketdetail",
meta: {
title: "工单详情",
// icon: "el-icon-menu",
hidden: true,
perms: ["duty"],
},
component: "wf/ticketdetail",
},
],
},
//电石渣 //电石渣
{ {
name: "enm_slag", name: "enm_slag",
@ -2175,101 +2270,6 @@ const routes = [
}, },
], ],
}, },
//审批
{
name: "wf",
path: "/wf",
meta: {
title: "审批管理",
icon: "sc-icon-Shenpi",
type: "menu",
perms: ["wf"],
},
children: [
{
name: "workflow",
path: "/wf/workflow",
meta: {
title: "工作流",
// icon: "el-icon-guide",
perms: ["workflow"],
},
component: "wf/workflow",
},
{
name: "configuration",
path: "/wf/configuration",
meta: {
title: "工作流配置",
// icon: "el-icon-menu",
hidden: true,
perms: ["workflow"],
},
component: "wf/configuration",
},
{
name: "allwork",
path: "/wf/allwork",
meta: {
title: "全部工单",
// icon: "el-icon-folder",
perms: ["allwork"],
},
component: "wf/allwork",
},
{
name: "ownerwork",
path: "/wf/ownerwork",
meta: {
title: "我创建的",
// icon: "el-icon-folder-add",
perms: ["ownerwork"],
},
component: "wf/ownerwork",
},
{
name: "duty",
path: "/wf/dutywork",
meta: {
title: "待办工单",
// icon: "el-icon-folder-opened",
perms: ["duty"],
},
component: "wf/dutywork",
},
{
name: "worked",
path: "/wf/worked",
meta: {
title: "我处理的",
// icon: "el-icon-expand",
perms: ["worked"],
},
component: "wf/worked",
},
{
name: "ccwork",
path: "/wf/ccwork",
meta: {
title: "抄送我的",
// icon: "el-icon-edit-pen",
perms: ["ccwork"],
},
component: "wf/ccwork",
},
{
name: "ticketdetail",
path: "/wf/ticketdetail",
meta: {
title: "工单详情",
// icon: "el-icon-menu",
hidden: true,
perms: ["duty"],
},
component: "wf/ticketdetail",
},
],
},
//区域 //区域
{ {
name: "am", name: "am",

2
src/style/app.scss
View File

@ -59,7 +59,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
.adminui-side-split-scroll::-webkit-scrollbar-track {background-color: rgba(255, 255, 255, 0);} .adminui-side-split-scroll::-webkit-scrollbar-track {background-color: rgba(255, 255, 255, 0);}
.adminui-side-split-scroll::-webkit-scrollbar-track:hover {background-color: rgba(255, 255, 255, 0);} .adminui-side-split-scroll::-webkit-scrollbar-track:hover {background-color: rgba(255, 255, 255, 0);}
.aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:210px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: 1px solid #e6e6e6;transition:width 0.3s;} .aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:180px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: 1px solid #e6e6e6;transition:width 0.3s;}
.adminui-side-top {border-bottom: 1px solid #ebeef5;height:50px;line-height: 50px;} .adminui-side-top {border-bottom: 1px solid #ebeef5;height:50px;line-height: 50px;}
.adminui-side-top h2 {padding:0 20px;font-size: 17px;color: #3c4a54;} .adminui-side-top h2 {padding:0 20px;font-size: 17px;color: #3c4a54;}
.adminui-side-scroll {overflow: auto;overflow-x:hidden;flex: 1;} .adminui-side-scroll {overflow: auto;overflow-x:hidden;flex: 1;}

6
src/views/home/widgets/components/eventlist.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-row :gutter="6"> <el-row :gutter="6">
<el-col :md="8" :sm="24"> <el-col :md="8" :sm="24">
<el-card shadow="hover" header="工单待办" style=""> <el-card shadow="hover" header="待办审批" style="">
<div class="card-body" v-if="dutyAgg.length>0" :style="{height:divHeight}"> <div class="card-body" v-if="dutyAgg.length>0" :style="{height:divHeight}">
<div v-for="item in dutyAgg" :key="item.workflow" style="margin-bottom: 10px;height: fit-content;"> <div v-for="item in dutyAgg" :key="item.workflow" style="margin-bottom: 10px;height: fit-content;">
<el-badge :value="item.count" class="item workItemImg"> <el-badge :value="item.count" class="item workItemImg">
@ -11,7 +11,7 @@
</div> </div>
</div> </div>
<div class="card-body" v-else :style="{height:divHeight}"> <div class="card-body" v-else :style="{height:divHeight}">
<div style="width:100%;line-height: 200px;color: #606266;text-align: center;">暂无待办工单</div> <div style="width:100%;line-height: 200px;color: #606266;text-align: center;">暂无待办审批</div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@ -177,7 +177,7 @@ export default {
query: {}, query: {},
}); });
}, },
//工单待办 //待办审批
async getdutyAgg() { async getdutyAgg() {
let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 }); let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
this.dutyAgg = res.details; this.dutyAgg = res.details;

8
src/views/home/widgets/components/ticket.vue
View File

@ -93,7 +93,7 @@
</el-row> </el-row>
<el-row :gutter="6"> <el-row :gutter="6">
<el-col :md="8" :sm="24"> <el-col :md="8" :sm="24">
<el-card shadow="hover" header="工单待办" > <el-card shadow="hover" header="待办审批" >
<div class="card-body opl_card_body" v-if="dutyAgg.length>0" :style="{height:divHeight,}"> <div class="card-body opl_card_body" v-if="dutyAgg.length>0" :style="{height:divHeight,}">
<div v-for="item in dutyAgg" :key="item.workflow" class="oplItem"> <div v-for="item in dutyAgg" :key="item.workflow" class="oplItem">
<el-badge :value="item.count" class="item workItemImg"> <el-badge :value="item.count" class="item workItemImg">
@ -103,7 +103,7 @@
</div> </div>
</div> </div>
<div class="card-body" v-else :style="{height:divHeight}"> <div class="card-body" v-else :style="{height:divHeight}">
<div class="noOpl">暂无待办工单</div> <div class="noOpl">暂无待办审批</div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@ -246,7 +246,7 @@ export default {
query: {}, query: {},
}); });
}, },
//工单待办 //待办审批
// async getdutyAgg() { // async getdutyAgg() {
// let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 }); // let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
// this.dutyAgg = res.details; // this.dutyAgg = res.details;
@ -385,7 +385,7 @@ export default {
query: {}, query: {},
}); });
}, },
//工单待办 //待办审批
async getdutyAgg() { async getdutyAgg() {
let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 }); let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
this.dutyAgg = res.details; this.dutyAgg = res.details;

2
src/views/wf/field.vue
View File

@ -97,7 +97,7 @@
<el-input v-model="addForm.default_value" placeholder="默认值"/> <el-input v-model="addForm.default_value" placeholder="默认值"/>
</el-form-item> </el-form-item>
<el-form-item label="模板"> <el-form-item label="模板">
<el-input v-model="addForm.field_template" placeholder="你有一个待办工单:{title}"/> <el-input v-model="addForm.field_template" placeholder="你有一个待办审批:{title}"/>
</el-form-item> </el-form-item>
<el-form-item label="是否隐藏"> <el-form-item label="是否隐藏">
<el-radio-group v-model="addForm.is_hidden"> <el-radio-group v-model="addForm.is_hidden">