diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index ed6a6c5..e1c3854 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -33,6 +33,73 @@
:upload-preview="handleUploadPreview"
:upload-after="uploadAfter"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
+ // this.form.renwuzhonglei = "";
+ // this.form.renwudengji = "";
+ const renwuzhonglei = this.findObject(
+ this.option.column,
+ "renwuzhonglei"
+ );
+ // renwuzhonglei.dicData = res.data.data;
+ this.kindList = res.data.data;
+ if(res.data.data.length != 0){
+ this.form.renwuzhonglei = res.data.data[0].id;
+ this.form.renwudengji = res.data.data[0].taskLevel;
+
+
+ }else{
+ this.form.renwuzhonglei = "";
+ this.form.renwudengji = "";
+ }
+ });
+ },
+ //切换任务种类
+ changeKind(id){
+ this.form.renwudengji = this.kindList.find(item => item.id == id).taskLevel
+ },
+ //切换系统名称数据库
+ systemChange(id){
+ getDatabaseTab({
+ id: id,
+ }).then(res =>{
+ let xitongmokuaishujubiao = this.findObject(
+ this.option.column,
+ "xitongmokuaishujubiao"
+ );
+ xitongmokuaishujubiao.dicData = res.data.data;
+ if(xitongmokuaishujubiao.dicData.length !== 0){
+ this.form.xitongmokuaishujubiao = xitongmokuaishujubiao.dicData[0].id;
+ }else{
+ this.form.xitongmokuaishujubiao = ''
+ }
+ })
+ },
+ //切换运维公司
+ companyChange(id){
+ let obj = this.companyList.find(function (i) {
+ return i.id === id;
+ });
+ getDepts({ id: obj.deptId }).then((res) => {
+ // const guanlibumen = this.findObject(this.option.column, "guanlibumen");
+ const guanlibumen = this.option.column[1];
+ guanlibumen.dicData = res.data.data;
+ if (res.data.data.length === 1) {
+ this.form.guanlibumen = guanlibumen.dicData[0].id;
+ }
+ });
+ getDatabasePro({id:id}).then(res =>{
+ this.taskAndDataBaseList = res.data.data;
+ if(this.isDraft){
+ this.systemChange(this.form.xitongmingchengshujuku,1);
+ this.isDraft = false
+ }else{
+ if(this.taskAndDataBaseList.length !== 0){
+ this.form.xitongmingchengshujuku = this.taskAndDataBaseList[0].id
+ this.systemChange(this.taskAndDataBaseList[0].id,-1)
+ }else{
+ this.form.xitongmingchengshujuku = ''
+ const xitongmokuaishujubiao = this.findObject(
+ this.option.column,
+ "xitongmokuaishujubiao"
+ );
+ xitongmokuaishujubiao.dicData = res.data.data;
+ this.form.xitongmokuaishujubiao = "";
+ }
+ }
+ })
+ },
// 获取任务详情
getDetail(taskId, processInsId) {
this.getTaskDetail(taskId, processInsId).then(async (res) => {
@@ -289,7 +455,6 @@ export default {
detail: true,
});
}
- // console.log(option.column.find(item => item.prop == 'renwudengji'))
option.column.find(item => item.prop == 'renwudengji').dicUrl = ''
this.option = option;
this.vars = vars;
@@ -297,31 +462,65 @@ export default {
const { yunweigongsi, renwufulei, xitongmingchengshujuku } =
variables;
// 其它下拉字典匹配
- const companyData = await getCompany({isDetail:1});
- let ywgs = this.findObject(option.column, "yunweigongsi");
- ywgs.dicData = companyData.data.data;
+ if(status !== 'todo'){
+ const companyData = await getCompany({isDetail:1});
+ // let ywgs = this.findObject(option.column, "yunweigongsi");
+ // ywgs.dicData = companyData.data.data;
+ this.companyList = companyData.data.data
+ // 任务父类
+ const taskParent = await getTaskParent();
+ this.taskParentList = taskParent.data.data
+ // const rwfl = this.findObject(option.column, "renwufulei");
+ // rwfl.dicData = taskParent.data.data;
+ // 任务种类
+ const taskTypeData = await getTaskTypeData({ parentId: renwufulei,isDetail:1 });
+ // const renwuzhonglei = this.findObject(
+ // this.option.column,
+ // "renwuzhonglei"
+ // );
+ // renwuzhonglei.dicData = taskTypeData.data.data;
+ this.kindList = taskTypeData.data.data
+ // 任务等级
+ const taskTypeLevel = await getTaskLevel({isDetail:1 });
+ const renwudengji = this.findObject(
+ this.option.column,
+ "renwudengji"
+ );
+ renwudengji.dicData = taskTypeLevel.data.data;
+ }else{
+ const companyData = await getCompany({isDetail:0});
+ this.companyList = companyData.data.data
+ // let ywgs = this.findObject(option.column, "yunweigongsi");
+ // ywgs.dicData = companyData.data.data;
+ // ywgs.disabled = ywgs.dicData.length == 1 ? true : false
+ // 任务父类
+ const taskParent = await getTaskParent();
+ // const rwfl = this.findObject(option.column, "renwufulei");
+ // rwfl.dicData = taskParent.data.data;
+ this.taskParentList = taskParent.data.data
+ // 任务种类
+ const taskTypeData = await getTaskTypeData({ parentId: renwufulei,isDetail:0 });
+ // const renwuzhonglei = this.findObject(
+ // this.option.column,
+ // "renwuzhonglei"
+ // );
+ // renwuzhonglei.dicData = taskTypeData.data.data;
+ this.kindList = taskTypeData.data.data
+ const taskTypeLevel = await getTaskLevel({isDetail:0 });
+ const renwudengji = this.findObject(
+ this.option.column,
+ "renwudengji"
+ );
+ renwudengji.dicData = taskTypeLevel.data.data;
+ }
+
// 部门
const deptDate = await getDepts({ id: yunweigongsi });
const guanlibumen = this.findObject(option.column, "guanlibumen");
guanlibumen.dicData = deptDate.data.data;
- // 任务父类
- const taskParent = await getTaskParent();
- const rwfl = this.findObject(option.column, "renwufulei");
- rwfl.dicData = taskParent.data.data;
- // 任务种类
- const taskTypeData = await getTaskTypeData({ parentId: renwufulei,isDetail:1 });
- const renwuzhonglei = this.findObject(
- this.option.column,
- "renwuzhonglei"
- );
- renwuzhonglei.dicData = taskTypeData.data.data;
- // 任务等级
- const taskTypeLevel = await getTaskLevel({isDetail:1 });
- const renwudengji = this.findObject(
- this.option.column,
- "renwudengji"
- );
- renwudengji.dicData = taskTypeLevel.data.data;
+
+
+
// 数据库
// const taskAndDataBaseData = await getTaskAndDataBase({
// id: yunweigongsi,
@@ -329,16 +528,16 @@ export default {
const taskAndDataBaseData = await getDatabasePro({
id: yunweigongsi,
});
- let datasql = this.findObject(
- this.option.column,
- "xitongmingchengshujuku"
- );
- datasql.dicData = taskAndDataBaseData.data.data;
+ // let datasql = this.findObject(
+ // this.option.column,
+ // "xitongmingchengshujuku"
+ // );
+ // datasql.dicData = taskAndDataBaseData.data.data;
+ this.taskAndDataBaseList = taskAndDataBaseData.data.data;
// 数据表
let obj = taskAndDataBaseData.data.data.find(function (i) {
return i.id === xitongmingchengshujuku;
});
- console.log(obj)
if(obj){
const moduleAndDataTableData = await getDatabaseTab({
id: obj.id,
@@ -355,7 +554,6 @@ export default {
// });
}
- console.log('variables',variables)
setTimeout(() => {
this.form = variables;
// this.form.renwuzhonglei = variables.renwuzhonglei
@@ -372,6 +570,10 @@ export default {
for (const i in option.column) {
option.column[i].disabled = true
}
+ this.yunweiDisabled = true
+ this.parentDisabled = true
+ this.sqlDisabled = true
+ this.kindDisabled = true
let shangchuan = this.findObject(option.column, "shangchuan");
shangchuan.display = false
if (column && column.length > 0) {
@@ -390,6 +592,10 @@ export default {
} else {
const columnFilter = this.filterAvueColumn(column, taskForm);
const columnArr = columnFilter.column;
+ this.yunweiDisabled = columnArr.find(item => item.prop == 'yunweigongsi').disabled
+ this.parentDisabled = columnArr.find(item => item.prop == 'renwufulei').disabled
+ this.sqlDisabled = columnArr.find(item => item.prop == 'xitongmingchengshujuku').disabled
+ this.kindDisabled = columnArr.find(item => item.prop == 'renwuzhonglei').disabled
vars = columnFilter.vars || [];
const groupArr = [];
@@ -436,7 +642,10 @@ export default {
this.vars.forEach((v) => {
if (v != "comment" && this.form[v]) variables[v] = this.form[v];
});
-
+ variables.xitongmingchengshujuku = this.form.xitongmingchengshujuku ?
+ this.form.xitongmingchengshujuku : '';
+ variables.xitongmokuaishujubiao = this.form.xitongmokuaishujubiao ?
+ this.form.xitongmokuaishujubiao : ''
this.handleCompleteTask(pass, variables)
.then(() => {
this.$message.success("处理成功");
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
index fe5aa9b..1d31632 100644
--- a/src/views/plugin/workflow/process/components/effect.vue
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -114,7 +114,7 @@ export default {
},
{
type: "input",
- label: "系统名称/数据库",
+ label: "系统名称/数据库/部门",
span: 7,
display: true,
prop: "operateSys",
@@ -124,7 +124,7 @@ export default {
},
{
type: "input",
- label: "系统名称/数据库",
+ label: "系统名称/数据库/部门",
span: 7,
display: true,
prop: "operateSysName",
@@ -261,8 +261,6 @@ export default {
remark,
detail
};
- console.log(this.form)
- console.log(this.userInfo)
if(this.userInfo){
this.option.column.find(item => item.prop == 'remark').disabled = (JSON.parse(this.$route.query.form).isFinish === 1 ||
JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
diff --git a/src/views/plugin/workflow/process/components/examForm.vue b/src/views/plugin/workflow/process/components/examForm.vue
index 1268e1d..2e7d0aa 100644
--- a/src/views/plugin/workflow/process/components/examForm.vue
+++ b/src/views/plugin/workflow/process/components/examForm.vue
@@ -44,6 +44,7 @@ export default {
// 1625035000825049090 日常
// 1624973130579636225 一般
if((this.userInfo.role_name === "运维公司" && val === "1625035000825049090") || (this.userInfo.role_name === "技术员" && val === "1624973130579636225")||(['运维公司执行任务','领导审批'].includes(this.process.taskName))) {
+
this.findObject(this.examineOption.column, '$assignee').display = false
this.flag = false
}else {
@@ -105,6 +106,7 @@ export default {
}
},
rules: [{ required: true, message: "请指定审批人" }],
+ display:true
}
]
},
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 7203c41..1bee625 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -261,7 +261,6 @@ export default {
// xitongmokuaishujubiao.dicData = [];
// this.form.xitongmokuaishujubiao = "";
getTaskLevel({isDetail:0}).then(res =>{
- console.log(res.data.data)
const taskLevel = this.findObject(
this.option.column,
"renwudengji"
@@ -322,7 +321,6 @@ export default {
let obj = this.taskAndDataBaseList.find(function (i) {
return i.id === id;
});
- console.log(obj)
// getModuleAndDataTable({ id: obj.id, type: obj.type }).then((res) => {
// if (index !== 1) {
// this.form.xitongmokuaishujubiao = "";