detail timeline 撤回
This commit is contained in:
@ -181,10 +181,10 @@
|
|||||||
import { listUser, deptTreeSelect } from "@/api/system/user";
|
import { listUser, deptTreeSelect } from "@/api/system/user";
|
||||||
import { listRole } from "@/api/system/role";
|
import { listRole } from "@/api/system/role";
|
||||||
import { addDateRange } from "@/utils/ruoyi";
|
import { addDateRange } from "@/utils/ruoyi";
|
||||||
import TreeSelect from "@/components/TreeSelect";
|
// import TreeSelect from "@/components/TreeSelect";
|
||||||
import { ref, reactive, watch } from "vue";
|
import { ref, reactive, watch } from "vue";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
const testResult = ref([]);
|
// const testResult = ref([]);
|
||||||
const userTaskForm = {
|
const userTaskForm = {
|
||||||
dataType: "",
|
dataType: "",
|
||||||
assignee: "",
|
assignee: "",
|
||||||
@ -296,7 +296,7 @@ function clearOptionsData() {
|
|||||||
deptIds.value = [];
|
deptIds.value = [];
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 跟新节点数据
|
* 更新节点数据
|
||||||
*/
|
*/
|
||||||
function updateElementTask() {
|
function updateElementTask() {
|
||||||
const taskAttr = Object.create(null);
|
const taskAttr = Object.create(null);
|
||||||
|
@ -19,10 +19,8 @@ const ruleTrigger = {
|
|||||||
|
|
||||||
const layouts = {
|
const layouts = {
|
||||||
colFormItem(h, scheme, disabled) {
|
colFormItem(h, scheme, disabled) {
|
||||||
console.log(disabled);
|
|
||||||
const config = scheme.__config__;
|
const config = scheme.__config__;
|
||||||
const listeners = buildListeners.call(this, scheme);
|
const listeners = buildListeners.call(this, scheme);
|
||||||
console.log(config, "28");
|
|
||||||
let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null;
|
let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null;
|
||||||
if (config.showLabel === false) labelWidth = "0";
|
if (config.showLabel === false) labelWidth = "0";
|
||||||
return (
|
return (
|
||||||
@ -104,7 +102,6 @@ function renderFormItem(h, elementList, disabled) {
|
|||||||
const config = scheme.__config__;
|
const config = scheme.__config__;
|
||||||
const layout = layouts[config.layout];
|
const layout = layouts[config.layout];
|
||||||
|
|
||||||
console.log(layout);
|
|
||||||
if (layout) {
|
if (layout) {
|
||||||
return layout.call(this, h, scheme, disabled);
|
return layout.call(this, h, scheme, disabled);
|
||||||
}
|
}
|
||||||
@ -119,7 +116,6 @@ function renderChildren(h, scheme, disabled) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function setValue(event, config, scheme) {
|
function setValue(event, config, scheme) {
|
||||||
console.log(event, config, scheme, "serval");
|
|
||||||
config.defaultValue = event;
|
config.defaultValue = event;
|
||||||
this[this.formConf.formModel][scheme.__vModel__] = event;
|
this[this.formConf.formModel][scheme.__vModel__] = event;
|
||||||
}
|
}
|
||||||
|
@ -393,6 +393,8 @@ const commentType = computed(() => {
|
|||||||
return "委派";
|
return "委派";
|
||||||
case "5":
|
case "5":
|
||||||
return "转办";
|
return "转办";
|
||||||
|
case "6":
|
||||||
|
return "撤回";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -409,6 +411,8 @@ const approveTypeTag = computed(() => {
|
|||||||
return "primary";
|
return "primary";
|
||||||
case "5":
|
case "5":
|
||||||
return "success";
|
return "success";
|
||||||
|
case "6":
|
||||||
|
return "warning";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user