1. 根据禅道需求修改

main
赵培友 3 years ago
parent 00104e3ece
commit 32de1932cf
  1. 8
      src/const/workflow/workorder.js
  2. 11
      src/page/index/sidebar/index.vue
  3. 1
      src/page/index/sidebar/sidebarItem.vue
  4. 2
      src/page/index/top/index.vue
  5. 11
      src/page/login/userlogin.vue
  6. 6
      src/router/axios.js
  7. 13
      src/styles/custom/custom.scss
  8. 7
      src/views/plugin/workflow/process/components/detail.vue
  9. 14
      src/views/plugin/workflow/process/components/form.vue
  10. 1
      src/views/plugin/workflow/process/implementation.vue
  11. 10
      src/views/plugin/workflow/process/workorder.vue
  12. 10
      src/views/wel/index.vue

@ -1,14 +1,14 @@
export const tableOption = { export const tableOption = {
index: true, index: true,
indexLabel: "序号", indexLabel: "序号",
indexWidth:120, indexWidth:80,
selection: false, selection: false,
border: false, border: false,
gutter: 60, //设置input的大小 gutter: 60, //设置input的大小
headerAlign: "left", headerAlign: "left",
align: "left", align: "left",
menuAlign:'left', menuAlign:'center',
menuHeaderAlign:'left', menuHeaderAlign:'center',
menuBtn: true, menuBtn: true,
editBtn: false, editBtn: false,
delBtn: false, delBtn: false,
@ -19,7 +19,7 @@ export const tableOption = {
refreshBtn: false, refreshBtn: false,
// dialogCustomClass: "custom", // dialogCustomClass: "custom",
header: false, header: false,
menuWidth:120, menuWidth:210,
column: [ column: [
{ {
type: "input", type: "input",

@ -9,7 +9,9 @@
:default-active="nowTagValue" :default-active="nowTagValue"
mode="vertical" mode="vertical"
:show-timeout="200" :show-timeout="200"
:collapse="keyCollapse"> :collapse="keyCollapse"
:default-openeds="openeds"
>
<sidebar-item :menu="menu" <sidebar-item :menu="menu"
:screen="screen" :screen="screen"
first first
@ -30,7 +32,9 @@
components: {sidebarItem, logo}, components: {sidebarItem, logo},
inject: ["index"], inject: ["index"],
data() { data() {
return {}; return {
openeds: ["/plugin/workflow/process"],
};
}, },
created() { created() {
this.index.openMenu(); this.index.openMenu();
@ -41,7 +45,8 @@
return this.$router.$avueRouter.getValue(this.$route); return this.$router.$avueRouter.getValue(this.$route);
} }
}, },
methods: {} methods: {
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

@ -125,6 +125,7 @@
} }
}, },
open(item) { open(item) {
console.log(item)
if (this.screen <= 1) this.$store.commit("SET_COLLAPSE"); if (this.screen <= 1) this.$store.commit("SET_COLLAPSE");
if (this.validIsOpen(item)) { if (this.validIsOpen(item)) {
window.open(item[this.pathKey]); window.open(item[this.pathKey]);

@ -21,7 +21,7 @@
</div> --> </div> -->
<el-dropdown> <el-dropdown>
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<span style="cursor:pointer;">{{userInfo.real_name}}</span> <span style="cursor:pointer;color:#000;">{{userInfo.real_name}}</span>
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">

@ -42,7 +42,7 @@
/> />
</el-input> </el-input>
</el-form-item> </el-form-item>
<div><el-checkbox v-model="rememberPwd">记住密码</el-checkbox></div> <div><el-checkbox v-model="rememberPwd"><span style="color:#666;">记住密码</span></el-checkbox></div>
<!-- <el-form-item v-if="this.website.captchaMode" prop="code"> <!-- <el-form-item v-if="this.website.captchaMode" prop="code">
<el-row :span="24"> <el-row :span="24">
<el-col :span="16"> <el-col :span="16">
@ -332,14 +332,19 @@ export default {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
color: #333; color: #000;
position: relative; position: relative;
font-size: 14px;
} }
/deep/ .el-form--label-top .el-form-item__label { /deep/ .el-form--label-top .el-form-item__label {
font-size: 16px; font-size: 16px;
color: #333; color: #000 !important;
padding: 0 !important; padding: 0 !important;
} }
/deep/ .el-form-item__label {
color: #000;
}
/deep/ .el-form-item__label:before { /deep/ .el-form-item__label:before {
display: none; display: none;
} }

@ -31,7 +31,7 @@ NProgress.configure({
//http request拦截 //http request拦截
axios.interceptors.request.use(config => { axios.interceptors.request.use(config => {
//开启 progress bar //开启 progress bar
NProgress.start(); // NProgress.start();
//headers判断是否需要 //headers判断是否需要
const authorization = config.authorization === false; const authorization = config.authorization === false;
if (!authorization) { if (!authorization) {
@ -58,7 +58,7 @@ axios.interceptors.request.use(config => {
//http response 拦截 //http response 拦截
axios.interceptors.response.use(res => { axios.interceptors.response.use(res => {
//关闭 progress bar //关闭 progress bar
NProgress.done(); // NProgress.done();
//获取状态码 //获取状态码
const status = res.data.code || res.status; const status = res.data.code || res.status;
const statusWhiteList = website.statusWhiteList || []; const statusWhiteList = website.statusWhiteList || [];
@ -77,7 +77,7 @@ axios.interceptors.response.use(res => {
} }
return res; return res;
}, error => { }, error => {
NProgress.done(); // NProgress.done();
return Promise.reject(new Error(error)); return Promise.reject(new Error(error));
}); });

@ -21,7 +21,11 @@
} }
.el-table tr { .el-table tr {
height: 80px; height: 80px;
color: #374454; color: #000;
}
.el-table td {
color: #000;
font-size: 14px;
} }
} }
// 分页 // 分页
@ -131,4 +135,9 @@
// 查看表单 // 查看表单
.avue--detail .el-col-7 { .avue--detail .el-col-7 {
width: 33.3%; width: 33.3%;
} }
.el-button--default {
color: #000;
}

@ -344,7 +344,12 @@ export default {
let vars = []; let vars = [];
if (status != "todo") { if (status != "todo") {
// //
option.detail = true; // option.detail = true;
for (const i in option.column) {
option.column[i].disabled = true
}
let shangchuan = this.findObject(option.column, "shangchuan");
shangchuan.display = false
if (column && column.length > 0) { if (column && column.length > 0) {
// column // column
column.forEach((col) => this.handleResolveEvent(col)); column.forEach((col) => this.handleResolveEvent(col));

@ -55,6 +55,7 @@
<template slot="xitongmingchengshujuku"> <template slot="xitongmingchengshujuku">
<el-select <el-select
filterable filterable
clearable
v-model="form.xitongmingchengshujuku" v-model="form.xitongmingchengshujuku"
placeholder="请选择系统名称/数据库" placeholder="请选择系统名称/数据库"
@change="systemChange" @change="systemChange"
@ -173,6 +174,7 @@ import WfExamineForm from "./examForm.vue";
import WfUserSelect from "./user-select"; import WfUserSelect from "./user-select";
import exForm from "../../mixins/ex-form"; import exForm from "../../mixins/ex-form";
import draft from "../../mixins/draft"; import draft from "../../mixins/draft";
import { dateFormat } from "@/util/date"
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
components: { components: {
@ -254,8 +256,8 @@ export default {
// const guanlibumen = this.findObject(this.option.column, "guanlibumen"); // const guanlibumen = this.findObject(this.option.column, "guanlibumen");
const guanlibumen = this.option.column[1]; const guanlibumen = this.option.column[1];
guanlibumen.dicData = res.data.data; guanlibumen.dicData = res.data.data;
if(res.data.data.length === 1) { if (res.data.data.length === 1) {
this.form.guanlibumen = guanlibumen.dicData[0].id this.form.guanlibumen = guanlibumen.dicData[0].id;
} }
}); });
getTaskAndDataBase({ id }).then((res) => { getTaskAndDataBase({ id }).then((res) => {
@ -371,11 +373,16 @@ export default {
this.option.column, this.option.column,
"qiwangwanchengshijian" "qiwangwanchengshijian"
); );
//
time.pickerOptions = { time.pickerOptions = {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
}, },
}; };
//
let addHour = new Date().setHours(new Date().getHours() + 48);
time.value = dateFormat(new Date(addHour));
this.form.chongfumoshi = "1627589799957266433";
if (this.permission.wf_process_draft) { if (this.permission.wf_process_draft) {
// 稿 // 稿
this.initDraft(process.id).then((data) => { this.initDraft(process.id).then((data) => {
@ -383,12 +390,13 @@ export default {
.then(() => { .then(() => {
const form = JSON.parse(data); const form = JSON.parse(data);
this.systemChange(form.xitongmingchengshujuku, 1); this.systemChange(form.xitongmingchengshujuku, 1);
this.form = form this.form = form;
}) })
.catch(() => {}); .catch(() => {});
}); });
} }
} }
this.waiting = false; this.waiting = false;
}); });
}, },

@ -209,6 +209,7 @@ export default {
this.searchForm.endTime = this.searchForm.timeArr[1]; this.searchForm.endTime = this.searchForm.timeArr[1];
} }
getList({ getList({
processInstanceId: this.$route.query.id?this.$route.query.id:'',
current: currentPage, current: currentPage,
size: pageSize, size: pageSize,
...this.searchForm, ...this.searchForm,

@ -142,7 +142,8 @@
@size-change="sizeChange" @size-change="sizeChange"
> >
<template slot-scope="{ row }" slot="menu"> <template slot-scope="{ row }" slot="menu">
<el-button @click="dynamicRoute(row, 'detail')">详情</el-button> <el-button @click="dynamicRoute(row, 'detail')" >详情</el-button>
<el-button @click="effect(row)" style="margin-left:8px;">实施详情</el-button>
</template> </template>
<template slot-scope="scope" slot="status"> <template slot-scope="scope" slot="status">
<span <span
@ -293,6 +294,13 @@ export default {
this.$message.success("导出成功!"); this.$message.success("导出成功!");
}); });
}, },
//
effect(row) {
console.log(row)
this.$router.push({
path: '/plugin/workflow/process/implementation?id=' + row.processInstanceId,
})
}
}, },
}; };
</script> </script>

@ -18,9 +18,9 @@
class="num" class="num"
:style="{ :style="{
color: color:
item.id === 1 item.id === 2
? '#FF8723' ? '#FF8723'
: item.id === 2 : item.id === 1
? '#27D477' ? '#27D477'
: item.id === 3 : item.id === 3
? '#2E92F6' ? '#2E92F6'
@ -87,13 +87,13 @@ export default {
headerList: [ headerList: [
{ {
id: 1, id: 1,
title: "到期提醒", title: "我的待办",
num: "", num: "",
link: "/plugin/workflow/process/todo", link: "/plugin/workflow/process/todo",
}, },
{ {
id: 2, id: 2,
title: "我的待办", title: "到期提醒",
num: "", num: "",
link: "/plugin/workflow/process/todo", link: "/plugin/workflow/process/todo",
}, },

Loading…
Cancel
Save