From fadd9e2e4f5ab230c17d0bcdb603ebfe1f81d736 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sat, 25 Nov 2023 14:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/requestapi.ts | 27 ++- src/api/DesignForm/type.ts | 6 + src/api/taskapi/types.ts | 1 + src/assets/icons/caogaoxiang(1).svg | 1 + src/assets/icons/caogaoxiang.svg | 1 + src/assets/icons/daiBanShiYi.svg | 1 + src/assets/icons/myQingQiu.svg | 1 + src/assets/icons/newFlow.svg | 1 + src/assets/icons/yiBanRenwu.svg | 1 + src/assets/images/1.png | Bin 0 -> 2152 bytes src/assets/images/2.png | Bin 0 -> 4097 bytes .../DesignForm/public/expand/user.vue | 8 +- .../DesignForm/public/expand/userDialog.vue | 8 +- .../DesignForm/public/form/form.vue | 28 +-- .../DesignForm/public/form/formGroup.vue | 2 +- .../DesignForm/public/form/formItem.vue | 8 +- .../workflow/drwer/approverDrawer.vue | 2 +- src/utils/workflow/index.ts | 8 +- src/views/public/orguser/orgalluser.vue | 6 +- src/views/sysworkflow/codepage/page.vue | 2 +- .../taskmanagement/completedmatters.vue | 194 ++++++++++++++++ .../taskplatform/taskmanagement/drafts.vue | 173 ++++++++++++++ .../taskmanagement/edittaskcustomerform.vue | 6 +- .../taskplatform/taskmanagement/flowStep.vue | 26 ++- .../taskmanagement/lookAndOperateLogInfo.vue | 188 ++++++++++++++++ .../taskplatform/taskmanagement/myrequest.vue | 194 ++++++++++++++++ .../taskmanagement/newaddflow.vue | 98 ++++++++ .../taskmanagement/runFlowStep.vue | 213 ++++++++++++++++++ .../taskmanagement/taskcustomerform.vue | 14 +- .../taskmanagement/taskcustomerformnew.vue | 62 +++-- .../taskplatform/taskmanagement/taskentry.vue | 2 +- .../taskplatform/taskmanagement/tasklist.vue | 2 +- .../taskplatform/taskmanagement/todolist.vue | 194 ++++++++++++++++ 33 files changed, 1404 insertions(+), 74 deletions(-) create mode 100644 src/assets/icons/caogaoxiang(1).svg create mode 100644 src/assets/icons/caogaoxiang.svg create mode 100644 src/assets/icons/daiBanShiYi.svg create mode 100644 src/assets/icons/myQingQiu.svg create mode 100644 src/assets/icons/newFlow.svg create mode 100644 src/assets/icons/yiBanRenwu.svg create mode 100644 src/assets/images/1.png create mode 100644 src/assets/images/2.png create mode 100644 src/views/taskplatform/taskmanagement/completedmatters.vue create mode 100644 src/views/taskplatform/taskmanagement/drafts.vue create mode 100644 src/views/taskplatform/taskmanagement/lookAndOperateLogInfo.vue create mode 100644 src/views/taskplatform/taskmanagement/myrequest.vue create mode 100644 src/views/taskplatform/taskmanagement/newaddflow.vue create mode 100644 src/views/taskplatform/taskmanagement/runFlowStep.vue create mode 100644 src/views/taskplatform/taskmanagement/todolist.vue 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 0000000000000000000000000000000000000000..7d1e905ca0af330bc25e4b22ade02f694478a61f GIT binary patch literal 2152 zcmcJR_d6R37soSdyjtT@qG+R9RU>ANSeKUO)#@-RYE^VSz} zA{A0fKMmgh=-~MZn{M4r_yO*S7U2^%sY^|j5oV#zMB@P(s^*-@o?fOKC2zHoGxR|& ziF-GAD0KTbZm^0&!sz>ueTV$BDl<8z4I#9f@64?wF(anOiJ72B!D;wFj$}G9k4x+-}s|Z9| zqUbYL=Lzo$Kzv(+t@vY*^Z`s1hMc0L|2_G*b}Q6XlsZ2@_GHkh%zloCZ1rh@)IYrS z_6)bR=8Ko3W=hHQl9m`4bpf3$nwk@8iPGD~Dh%{@kwrAP7&Z;4+LN|u$_StVE|(+$SPv41k3l)-RL29jYDq549SDONwHU7$g%fq9&;cIY=GqRx>MHU2 zBQ8}96!kkF%JFl~ib_;2u%90ZSW;;7iv%*y{dn2c9{ftIn@3d{GrGZ}WD; zCj>Sr@xKvVM$evqFfd;KPFh;}fWsybEL#U6U(2ZDc2?=KZ z9-9{iWA4{N^`BlBys(mH*FC@y${H2s5hvop(S!{!9475GjzB`Zn{{r`CqJ$=`Vc`b z)Sy>^>zob!Os%1Y@2vV3LbUpQ8(}52s75W8m-}1sb0QgW>P_}CfYOF<=J#%Pf!qWA zzb*qW&EFgj%p&-|lfgVL7}0rT6eGAd?ZpIk+x1HY`6RcA zsgmwHuljUOoi=PbXU|aPHdGFaHz;9)+8W$P=UP44x@0cD`cMIr$KN&9$Jey&87+<_ z5sDMtSmm%C5ziwvKj09ul|_e7xVfAb-wi_B&lZFiIWK(?Q^l}GwIGK7u+m_t>QA+3 zo>?TtF@C3AOf_qmO*!&ZLDSBxq?~vq&W>CZS;O(T~i)xd`A>1Sa>_ z#u6>le`j(*Z4=vjZNY6Egi@*odc6f#ChN-p{N2JT+J#EGCXyY`EWD}|3S|gQr-Y_> ztu1c8x%R6@DuY0VpBxFySkZfO3H{Zp>1sMn*5|vPo&B%DrDm~a9%;4WTYas&CP41X zKRP|TogRk=%K{|ATniObNT+;09ZFuBI1nt_gNE!W&DFNX|5bHQs>Ude_#`0Ah5Mm# z+z*-s5IFV*F?}q|Alw+Sy-10&l24iQIK8!<3(FISqN^V~i{$5@l`pu9uzfZDihU=& zmW(aYx$}A0yTjwpczRRaEp5z1^5M?Ku!3WkSj$JxFBnd2R#>b}B3Fd@7QY?*8c|W2 zK&IX*JFMXSNsY4+jQNNUF=~vUiC8AL{R4#5;CZX z5G+a70RTw2S~P3=a68~T*iqAEZ^w^tMXs$@en-rgk!v2Wl~U99wht@86bu#>nMS0g zSa5gvcrH-s`XPy0tnB|7+h&e>^P%75H&^zP_OPjO^t zO(*7N#AiIc$kf8l-Ihnc22&SK zvUz!12jyV#6VzrUI?MZnTB>*d{Qn*AmdYWeVf)&N(v*gN&y;@~PB z6?C2K{(72mRjj#h6n1W;FmfcOe1=CNF-fWyetDqT2Kd+WYsNe&cFW~NASHYp-ZdY) zI9j@mYvk5p%24;C(%1d-k?)p)$6Hbs!hkqpEI^W?OsJ5g?h(CW3*> zHjy(ET>n>ti>*lGH~x@s#Zau;rS}*F3A}d8=8HPv()n!T1piXL<=1^pTcX=c4o@lO zb-)r|lsvoqUtHeSr1}|vuwFL6&u9IPEP|b7BF+Aw`>;wgFt>rVr>yoifhV-Q<*XlR z{PD*cVv&S)PM8p6M_;s!k=K6{ZByzS9ITB}qNM>)Sg*k7p}4u_e$>TDp9Tpu!_Ij0XP{XrvLx| literal 0 HcmV?d00001 diff --git a/src/assets/images/2.png b/src/assets/images/2.png new file mode 100644 index 0000000000000000000000000000000000000000..e16488e4534d25626ac002e04ce9c64cd834ade2 GIT binary patch literal 4097 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"") 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) }