diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index 7ca85d064..31c83c4ca 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -21,7 +21,8 @@ import { hanziToPinyin, gogoBackFormTabelStruct, nodeFlow, - searchUserListForm + searchUserListForm, + taskflowquery } from './type'; //自定义表单列表 export function getCustomerFormList(queryParams: SearchForm): AxiosPromise { @@ -186,3 +187,27 @@ export function gainFlowPeople(data?: string[]){ data: data }); } +//发起工作流 +export function startRunFlow(data?:any){ + return request({ + url: '/systemapi/task_flow/startRunFlow', + method: 'post', + data: data + }); +} +//流程任务 +export function taskFlowList(data?:taskflowquery){ + return request({ + url: '/systemapi/task_flow/taskFlowList', + method: 'post', + data: data + }); +} +//获取正在执行得任务流程 +export function gainRunTaskFlow(data?:customerFormLogo){ + return request({ + url: '/systemapi/task_flow/gainRunTaskFlow', + method: 'post', + data: data + }); +} diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index 5e3f89d83..0677054db 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -171,3 +171,9 @@ export interface searchUserListForm extends PageQuery{ name?: string; department?:number; } +//流程任务 +export interface taskflowquery extends PageQuery{ + title?: string; //任务标题 + class?:number; //类型：1、我的请求；2、待办事宜；3、已办事宜；4：草稿箱 + state?:number; //状态：状态：1、草稿；2：驳回；3：审批中；4：归档；5：删除 +} diff --git a/src/api/taskapi/types.ts b/src/api/taskapi/types.ts index c5a1f9cd9..3d463af0e 100644 --- a/src/api/taskapi/types.ts +++ b/src/api/taskapi/types.ts @@ -23,6 +23,7 @@ export interface taskLonCont{ //获取可执行得任务列表 export interface gainTaskListQuery extends PageQuery { status?: number; + type?: number; } //执行得任务记录列表 export interface taskListCont{ diff --git a/src/assets/icons/caogaoxiang(1).svg b/src/assets/icons/caogaoxiang(1).svg new file mode 100644 index 000000000..335cbcb76 --- /dev/null +++ b/src/assets/icons/caogaoxiang(1).svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/caogaoxiang.svg b/src/assets/icons/caogaoxiang.svg new file mode 100644 index 000000000..918d62a02 --- /dev/null +++ b/src/assets/icons/caogaoxiang.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/daiBanShiYi.svg b/src/assets/icons/daiBanShiYi.svg new file mode 100644 index 000000000..a52ee66ce --- /dev/null +++ b/src/assets/icons/daiBanShiYi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/myQingQiu.svg b/src/assets/icons/myQingQiu.svg new file mode 100644 index 000000000..16e48815c --- /dev/null +++ b/src/assets/icons/myQingQiu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/newFlow.svg b/src/assets/icons/newFlow.svg new file mode 100644 index 000000000..aa3c3fc29 --- /dev/null +++ b/src/assets/icons/newFlow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/yiBanRenwu.svg b/src/assets/icons/yiBanRenwu.svg new file mode 100644 index 000000000..d1d38eadd --- /dev/null +++ b/src/assets/icons/yiBanRenwu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/1.png b/src/assets/images/1.png new file mode 100644 index 000000000..7d1e905ca Binary files /dev/null and b/src/assets/images/1.png differ diff --git a/src/assets/images/2.png b/src/assets/images/2.png new file mode 100644 index 000000000..e16488e45 Binary files /dev/null and b/src/assets/images/2.png differ diff --git a/src/components/DesignForm/public/expand/user.vue b/src/components/DesignForm/public/expand/user.vue index 4c74cf570..0dbadee94 100644 --- a/src/components/DesignForm/public/expand/user.vue +++ b/src/components/DesignForm/public/expand/user.vue @@ -28,16 +28,16 @@ const userDialogEl = ref() // const userlist = ref("") const value = computed({ get: () => { - console.log("value-get",props.modelValue) + // console.log("value-get",props.modelValue) // userlist.value = props.modelValue return props.modelValue }, set: (newVal: any) => { - console.log("value-set",newVal,newVal.length) + // console.log("value-set",newVal,newVal.length) // emits('update:modelValue', newVal) let newValJson:criteriaForPeopleList[] = JSON.parse(newVal) - console.log("value-newValJson",newValJson) + // console.log("value-newValJson",newValJson) if(newValJson.length > 0){ let userAry = new Array @@ -62,7 +62,7 @@ const openDialog = () => { userDialogEl.value.open() } onMounted(() => { - console.log("value---1--》",value.value,props.modelValue) + // console.log("value---1--》",value.value,props.modelValue) nextTick(() => {}) }) diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue index b20d4eb65..5cf031cca 100644 --- a/src/components/DesignForm/public/expand/userDialog.vue +++ b/src/components/DesignForm/public/expand/userDialog.vue @@ -35,7 +35,7 @@ const getTreeData = () => { // }) getOrgFormTree() .then(({ data }) => { - console.log(data) + // console.log(data) treeData.value = data.list }).finally(()=>{}) } @@ -103,7 +103,7 @@ const tableRowClick = (row: any) => { // console.log("checkDataList",checkDataList,row) } const delRowClick = (row: criteriaForPeopleList) => { - console.log("checkDataList",row) + // console.log("checkDataList",row) // checkData.value.forEach((item: any, index: number) => { // if (item === row) { // checkData.value.splice(index, 1) @@ -137,11 +137,11 @@ const delAllClick = () => { // 弹窗处理 const open = () => { visible.value = true - console.log("open--->",props.modelValue) + // console.log("open--->",props.modelValue) if (props.modelValue) { searchUserCustomerFormList({name:props.modelValue}) .then(({data})=>{ - console.log("弹窗处理",data) + // console.log("弹窗处理",data) // checkDataList = data checkDataList.splice(0,checkDataList.length) if(data.length > 0){ diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 0476e8a10..a291f48ee 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -125,7 +125,7 @@ const model = ref({}) const getInitModel = () => { const obj = {} forEachGetFormModel(props.formData.list, obj) - console.log("obj===>",obj) + // console.log("obj===>",obj) model.value = obj } watch( @@ -157,7 +157,7 @@ const forEachGetFormModel = (list: FormList[], obj: any) => { // 表单组件值改变事件 tProp为子表格相关 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => { - console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute) + // console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute) if (typeof props.changeKeyVal === 'function') { props.changeKeyVal(key, value,type,attribute) } @@ -231,9 +231,9 @@ const ruleForm = ref() const validate = (callback: any) => { ruleForm.value.validate((valid: boolean, fields: any) => { - console.log("ruleForm.value--->filter-->",ruleForm.value) - console.log("getValue--->fields-->",fields) - console.log("getValue--->valid-->",valid) + // console.log("ruleForm.value--->filter-->",ruleForm.value) + // console.log("getValue--->fields-->",fields) + // console.log("getValue--->valid-->",valid) let fieldValue = fields if (valid) { @@ -245,8 +245,8 @@ const validate = (callback: any) => { } // 提供一个取值的方法 const getValue = (filter?: boolean) => { - console.log("getValue--->filter-->",filter) - console.log("getValue--->model-->",model) + // console.log("getValue--->filter-->",filter) + // console.log("getValue--->model-->",model) if (filter) { const obj: any = {} for (const key in model.value) { @@ -260,7 +260,7 @@ const getValue = (filter?: boolean) => { } return obj } else { - console.log("getValue--->model-value->",model.value) + // console.log("getValue--->model-value->",model.value) return model.value } } @@ -357,7 +357,7 @@ const getData = (params = {}) => { .then((res: any) => { loading.value = false const result = res.data - console.log("停止数据请求--->",res) + // console.log("停止数据请求--->",res) if (result) { let formatRes: any = result // 比较适用通用表单，保存在服务端 @@ -389,7 +389,7 @@ const getData = (params = {}) => { loading.value = false return ElMessage.error(res.message) }) - console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams) + // console.log("res------执行了获取数据方法，但配置有误----->", requestUrl,newParams2,newParams) } @@ -426,9 +426,9 @@ const submit = (params = {}) => { if (valid) { const formatParams = Object.assign({}, fields, params) - console.log("params--->",params) - console.log("fields--->",fields) - console.log("formatParams-Object-->",formatParams) + // console.log("params--->",params) + // console.log("fields--->",fields) + // console.log("formatParams-Object-->",formatParams) let submitParams const beforeSubmit = props.formData.events?.beforeSubmit @@ -454,7 +454,7 @@ const submit = (params = {}) => { // loading.value = true // console.log("apiUrl--->",apiUrl) // console.log("submitParams--->",submitParams) - console.log("formatParams--->",formatParams) + // console.log("formatParams--->",formatParams) // 提交保存表单 currencyFormApiSubmit(apiUrl, submitParams ?? formatParams) .then((res: any) => { diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index eebc64237..bce0b1af3 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -45,7 +45,7 @@ watch( () => props.data, (v: FormList[]) => { dataList.value = v - console.log("监听表单变化++++++++++>",v) + // console.log("监听表单变化++++++++++>",v) } ) const activeKey = computed(() => { diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index 42197c465..d4a7378fb 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -140,8 +140,12 @@ const currentComponent = computed(() => { props.data.control.valueFormat="x" } if (props.data.type === 'switch') { - props.data.control.activeValue=props.data.control.activeValue.toString() - props.data.control.inactiveValue=props.data.control.inactiveValue.toString() + if(typeof props.data.control.activeValue === "number"){ + props.data.control.activeValue=props.data.control.activeValue.toString() + } + if(typeof props.data.control.inactiveValue === "number"){ + props.data.control.inactiveValue=props.data.control.inactiveValue.toString() + } } // if (props.data.type === 'timePicker') { // props.data.control.valueFormat="timestamp" diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue index d1da8ba83..e542136ef 100644 --- a/src/components/workflow/drwer/approverDrawer.vue +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -337,7 +337,7 @@ const updateMatrix = (val:any) =>{ 依次审批 会签(须所有审批人同意) - 非会签(有一位审批人同意即可) + 或签(有一位审批人同意即可)
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts index 0ef9215a3..bd6cf8676 100644 --- a/src/utils/workflow/index.ts +++ b/src/utils/workflow/index.ts @@ -69,7 +69,7 @@ All.prototype = { } else if (nodeConfig.examineMode == 2) { return nodeConfig.nodeUserList.length + "人会签" }else if (nodeConfig.examineMode == 3) { - return nodeConfig.nodeUserList.length + "人非会签" + return nodeConfig.nodeUserList.length + "人或签" } }else{ // return "指定成员" @@ -82,7 +82,7 @@ All.prototype = { } else if (nodeConfig.examineMode == 2) { return level + "会签" }else if (nodeConfig.examineMode == 3) { - return level + + "非会签" + return level + + "或签" } } else if (nodeConfig.settype == 3) { // console.log("nodeConfig==会签==>",nodeConfig) @@ -121,7 +121,7 @@ All.prototype = { } else if (nodeConfig.examineMode == 2) { return nodeConfig.nodeUserList[0].name + "会签" }else if (nodeConfig.examineMode == 3) { - return nodeConfig.nodeUserList[0].name + "非会签" + return nodeConfig.nodeUserList[0].name + "或签" } } @@ -133,7 +133,7 @@ All.prototype = { } else if (nodeConfig.examineMode == 2) { return strVal + "会签" }else if (nodeConfig.examineMode == 3) { - return strVal + "非会签" + return strVal + "或签" } } diff --git a/src/views/public/orguser/orgalluser.vue b/src/views/public/orguser/orgalluser.vue index 98c4c818e..b574e2485 100644 --- a/src/views/public/orguser/orgalluser.vue +++ b/src/views/public/orguser/orgalluser.vue @@ -61,7 +61,7 @@ const getTreeData = () => { orgLoading.value = true getOrgFormTree() .then(({ data }) => { - console.log(data) + // console.log(data) treeData.value = data.list }).finally(()=>{ orgLoading.value = false @@ -147,7 +147,7 @@ const clostBox = () =>{ } //提交选择 const confirmChoices = () => { - console.log("confirmChoices",checkDataList) + // console.log("confirmChoices",checkDataList) emits('updateNode', checkDataList) clostBox() } @@ -159,7 +159,7 @@ const backfillData = () => { checkDataList.push(item) }) } - console.log("props.selectedPeople",props.selectedPeople,checkDataList) + // console.log("props.selectedPeople",props.selectedPeople,checkDataList) }