From dbcf8d480c72331959dc881fca3d83146cb8e31b Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Thu, 5 Mar 2026 11:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/myToDoPage-952c20f8.js | 2 +- .../DesignForm/public/form/childTable.vue | 2 +- .../DesignForm/public/form/formGroup.vue | 6 +-- .../DesignForm/public/form/formItem.vue | 8 ++-- src/utils/request.ts | 6 +-- src/utils/workflow/const.ts | 1 - .../appPageForm/unitsPageFrom/design.vue | 14 +++---- .../lowcodepage/pageFlow/flowStep.vue | 23 +++++++++--- .../lowcodepage/pageFlow/newTableFlow.vue | 37 +++++++++++-------- .../runApp/regularPage/myToDoPage.vue | 2 +- .../taskmanagement/lookFlowInfoNewApp.vue | 2 +- 11 files changed, 59 insertions(+), 44 deletions(-) diff --git a/assets/myToDoPage-952c20f8.js b/assets/myToDoPage-952c20f8.js index 2efa7b1..c7c19b6 100644 --- a/assets/myToDoPage-952c20f8.js +++ b/assets/myToDoPage-952c20f8.js @@ -1 +1 @@ -import{d as W,r as d,ao as C,ax as q,G as H,a as r,f as F,h as l,c as i,I as D,$ as L,q as v,e as o,b as t,as as Y,H as s,Y as J,t as m,F as X,g as Z,f_ as ee,aj as te,an as oe,ab as ae,b3 as ne,aF as le,cz as se,N as re,b4 as ie,aA as pe,at as de,p as ce,m as _e,_ as ue}from"./index-e450010e.js";import{_ as fe}from"./index-c5018719.js";import{_ as me}from"./refresh-f1723430.js";import{_ as ge}from"./search-71444aff.js";import we from"./lookFlowInfoApp-293e6f1f.js";import"./runFlowStepApp-c2ddd4a0.js";const ye=c=>(ce("data-v-7bd64948"),c=c(),_e(),c),be={ref:"myappbox",class:"app_box"},ke={class:"app-container"},ve={class:"search"},xe=ye(()=>v("div",{class:"titleBox"}," 代办事宜 ",-1)),he=W({__name:"myToDoPage",props:{pickAppMenu:{type:Object,default(){return{}}},drawerWith:{type:Number,default:0}},setup(c){const x=c,V=d(!1),h=d(C),T=d([]),n=q({page:1,pagesize:20,class:2,id:x.pickAppMenu.appkey}),g=d(0),z=()=>{n.page=1,n.pagesize=15,n.title="",n.class=2,n.state=0},A=()=>{h.value.resetFields(),z()},I=()=>{ee(n).then(u=>{g.value=u.data.total,T.value=u.data.list})};H(()=>{I()});const w=()=>{I()},E=d(),_=d(!1),B=(u,a)=>{E.value=u,_.value=!0},U=()=>{};return(u,a)=>{const S=te,N=oe,M=ge,y=ae,O=me,P=C,p=ne,b=le,f=se,$=re,R=ie,j=fe,G=pe,K=de;return r(),F("div",be,[l(_)?(r(),i(we,{key:0,isshow:l(_),"onUpdate:isshow":a[0]||(a[0]=e=>D(_)?_.value=e:null),"flow-log-info":l(E),"drawer-with":x.drawerWith,onGetmytodolist:w},null,8,["isshow","flow-log-info","drawer-with"])):L("",!0),v("div",ke,[v("div",ve,[xe,o(P,{ref_key:"searckFormRefTd",ref:h,model:l(n),inline:!0},{default:t(()=>[o(N,{label:"任务标题",prop:"name"},{default:t(()=>[o(S,{modelValue:l(n).title,"onUpdate:modelValue":a[1]||(a[1]=e=>l(n).title=e),placeholder:"请输入任务标题",clearable:"",onKeyup:Y(U,["enter"])},null,8,["modelValue"])]),_:1}),o(N,null,{default:t(()=>[o(y,{type:"primary",onClick:a[2]||(a[2]=e=>w())},{default:t(()=>[o(M),s("搜索")]),_:1}),o(y,{onClick:a[3]||(a[3]=e=>A())},{default:t(()=>[o(O),s("重置")]),_:1})]),_:1})]),_:1},8,["model"])]),o(G,{shadow:"never"},{default:t(()=>[J((r(),i(R,{"element-loading-text":"Loading...","highlight-current-row":"",data:l(T),border:"",class:"table_box"},{default:t(()=>[o(p,{fixed:"",label:"标题",prop:"title",width:"500"}),o(p,{label:"创建人",prop:"creater",width:"150",align:"center"},{default:t(e=>[s(m(e.row.creatorInfo.name)+"（",1),o(b,{type:"info"},{default:t(()=>[s(m(e.row.creatorInfo.number),1)]),_:2},1024),s("） ")]),_:1}),o(p,{label:"发起日期",prop:"startDate",align:"center","min-width":"200"}),o(p,{label:"状态",prop:"status",align:"center",width:"120"},{default:t(e=>[e.row.status==1?(r(),i(f,{key:0,class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 草稿 ")]),_:1})):e.row.status==2?(r(),i(f,{key:1,type:"danger",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 驳回 ")]),_:1})):e.row.status==3?(r(),i(f,{key:2,type:"success",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 审批中 ")]),_:1})):e.row.status==4?(r(),i(f,{key:3,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 归档 ")]),_:1})):(r(),i(f,{key:4,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 删除 ")]),_:1}))]),_:1}),o(p,{label:"当前节点及操作人",prop:"currentStep",width:"200"},{default:t(e=>[e.row.currentNodeName?(r(),i(b,{key:0,type:"success"},{default:t(()=>[s(m(e.row.currentNodeName)+"：",1)]),_:2},1024)):L("",!0),(r(!0),F(X,null,Z(e.row.currentNodeUser,(k,Q)=>(r(),i(b,{key:Q,type:"warning"},{default:t(()=>[s(m(k.name)+"("+m(k.number)+")",1)]),_:2},1024))),128))]),_:1}),o(p,{fixed:"right",align:"center",label:"操作",width:"100"},{default:t(e=>[o($,{class:"box-item",effect:"dark",content:"查看详情",placement:"top-end"},{default:t(()=>[o(y,{type:"primary",size:"small",class:"fa fa-eye",onClick:k=>B(e.row,2)},null,8,["onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"])),[[K,l(V)]]),o(j,{total:l(g),"onUpdate:total":a[4]||(a[4]=e=>D(g)?g.value=e:null),page:l(n).page,"onUpdate:page":a[5]||(a[5]=e=>l(n).page=e),limit:l(n).pagesize,"onUpdate:limit":a[6]||(a[6]=e=>l(n).pagesize=e),onPagination:w},null,8,["total","page","limit"])]),_:1})])],512)}}});const De=ue(he,[["__scopeId","data-v-7bd64948"]]);export{De as default}; +import{d as W,r as d,ao as C,ax as q,G as H,a as r,f as F,h as l,c as i,I as D,$ as L,q as v,e as o,b as t,as as Y,H as s,Y as J,t as m,F as X,g as Z,f_ as ee,aj as te,an as oe,ab as ae,b3 as ne,aF as le,cz as se,N as re,b4 as ie,aA as pe,at as de,p as ce,m as _e,_ as ue}from"./index-e450010e.js";import{_ as fe}from"./index-c5018719.js";import{_ as me}from"./refresh-f1723430.js";import{_ as ge}from"./search-71444aff.js";import we from"./lookFlowInfoApp-293e6f1f.js";import"./runFlowStepApp-c2ddd4a0.js";const ye=c=>(ce("data-v-7bd64948"),c=c(),_e(),c),be={ref:"myappbox",class:"app_box"},ke={class:"app-container"},ve={class:"search"},xe=ye(()=>v("div",{class:"titleBox"}," 待办事宜 ",-1)),he=W({__name:"myToDoPage",props:{pickAppMenu:{type:Object,default(){return{}}},drawerWith:{type:Number,default:0}},setup(c){const x=c,V=d(!1),h=d(C),T=d([]),n=q({page:1,pagesize:20,class:2,id:x.pickAppMenu.appkey}),g=d(0),z=()=>{n.page=1,n.pagesize=15,n.title="",n.class=2,n.state=0},A=()=>{h.value.resetFields(),z()},I=()=>{ee(n).then(u=>{g.value=u.data.total,T.value=u.data.list})};H(()=>{I()});const w=()=>{I()},E=d(),_=d(!1),B=(u,a)=>{E.value=u,_.value=!0},U=()=>{};return(u,a)=>{const S=te,N=oe,M=ge,y=ae,O=me,P=C,p=ne,b=le,f=se,$=re,R=ie,j=fe,G=pe,K=de;return r(),F("div",be,[l(_)?(r(),i(we,{key:0,isshow:l(_),"onUpdate:isshow":a[0]||(a[0]=e=>D(_)?_.value=e:null),"flow-log-info":l(E),"drawer-with":x.drawerWith,onGetmytodolist:w},null,8,["isshow","flow-log-info","drawer-with"])):L("",!0),v("div",ke,[v("div",ve,[xe,o(P,{ref_key:"searckFormRefTd",ref:h,model:l(n),inline:!0},{default:t(()=>[o(N,{label:"任务标题",prop:"name"},{default:t(()=>[o(S,{modelValue:l(n).title,"onUpdate:modelValue":a[1]||(a[1]=e=>l(n).title=e),placeholder:"请输入任务标题",clearable:"",onKeyup:Y(U,["enter"])},null,8,["modelValue"])]),_:1}),o(N,null,{default:t(()=>[o(y,{type:"primary",onClick:a[2]||(a[2]=e=>w())},{default:t(()=>[o(M),s("搜索")]),_:1}),o(y,{onClick:a[3]||(a[3]=e=>A())},{default:t(()=>[o(O),s("重置")]),_:1})]),_:1})]),_:1},8,["model"])]),o(G,{shadow:"never"},{default:t(()=>[J((r(),i(R,{"element-loading-text":"Loading...","highlight-current-row":"",data:l(T),border:"",class:"table_box"},{default:t(()=>[o(p,{fixed:"",label:"标题",prop:"title",width:"500"}),o(p,{label:"创建人",prop:"creater",width:"150",align:"center"},{default:t(e=>[s(m(e.row.creatorInfo.name)+"（",1),o(b,{type:"info"},{default:t(()=>[s(m(e.row.creatorInfo.number),1)]),_:2},1024),s("） ")]),_:1}),o(p,{label:"发起日期",prop:"startDate",align:"center","min-width":"200"}),o(p,{label:"状态",prop:"status",align:"center",width:"120"},{default:t(e=>[e.row.status==1?(r(),i(f,{key:0,class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 草稿 ")]),_:1})):e.row.status==2?(r(),i(f,{key:1,type:"danger",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 驳回 ")]),_:1})):e.row.status==3?(r(),i(f,{key:2,type:"success",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 审批中 ")]),_:1})):e.row.status==4?(r(),i(f,{key:3,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 归档 ")]),_:1})):(r(),i(f,{key:4,type:"info",class:"mx-1",effect:"plain",round:""},{default:t(()=>[s(" 删除 ")]),_:1}))]),_:1}),o(p,{label:"当前节点及操作人",prop:"currentStep",width:"200"},{default:t(e=>[e.row.currentNodeName?(r(),i(b,{key:0,type:"success"},{default:t(()=>[s(m(e.row.currentNodeName)+"：",1)]),_:2},1024)):L("",!0),(r(!0),F(X,null,Z(e.row.currentNodeUser,(k,Q)=>(r(),i(b,{key:Q,type:"warning"},{default:t(()=>[s(m(k.name)+"("+m(k.number)+")",1)]),_:2},1024))),128))]),_:1}),o(p,{fixed:"right",align:"center",label:"操作",width:"100"},{default:t(e=>[o($,{class:"box-item",effect:"dark",content:"查看详情",placement:"top-end"},{default:t(()=>[o(y,{type:"primary",size:"small",class:"fa fa-eye",onClick:k=>B(e.row,2)},null,8,["onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"])),[[K,l(V)]]),o(j,{total:l(g),"onUpdate:total":a[4]||(a[4]=e=>D(g)?g.value=e:null),page:l(n).page,"onUpdate:page":a[5]||(a[5]=e=>l(n).page=e),limit:l(n).pagesize,"onUpdate:limit":a[6]||(a[6]=e=>l(n).pagesize=e),onPagination:w},null,8,["total","page","limit"])]),_:1})])],512)}}});const De=ue(he,[["__scopeId","data-v-7bd64948"]]);export{De as default}; diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index 172cff3..58d3ff5 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -387,7 +387,7 @@ function optionsValue3Get1(data: any, fieldName: string) { */ const jisuanTableWidth = (data: any) => { let width = 0; - console.log("jisuanTableWidth--->计算宽度",data.item.label.length,"---------->",data) + // console.log("jisuanTableWidth--->计算宽度",data.item.label.length,"---------->",data) // data.item.label.forEach((item: any) => { // // width += item.item.span?item.item.span:120; // }); diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index b18778f..a65e286 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -764,8 +764,8 @@ const currentNodePowerKey = inject('currentNodeKey') as any //获取当前节点授权 const curNodePowerAry = () => { - console.log("获取当前节点授权",currentNodePowerKey) - console.log("获取当前节点授权",allNodePwoer) + // console.log("获取当前节点授权",currentNodePowerKey) + // console.log("获取当前节点授权",allNodePwoer) if(currentNodePowerKey && currentNodePowerKey.value && currentNodePowerKey.value != ""){ if(allNodePwoer.value && Array.isArray(allNodePwoer.value) && allNodePwoer.value.length > 0){ let powerAry: any[] = [] @@ -789,7 +789,7 @@ const curNodePowerAry = () => { */ const judgeIsShow = (key: string) => { let myPower = curNodePowerAry() //获取权限数组 - console.log("判断此组件是否可见",myPower) + // console.log("判断此组件是否可见",myPower) if(Array.isArray(myPower) && myPower.length > 0){ let isOk = true myPower.forEach((item:powerAryInfo) => { diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index aaa7ec3..ae50705 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -739,7 +739,7 @@ const judgeIsShow = (key: string) => { @ 功能: 判断是否禁用 */ const judgeIsDisabled = (key: string) => { - console.log("判断是否禁用", key); + // console.log("判断是否禁用", key); // console.log("测试是否获取授权-1-->",allNodePwoer) // console.log("测试是否获取授权-2-->",currentNodePowerKey) if (type.value === 3) { @@ -755,7 +755,7 @@ const judgeIsDisabled = (key: string) => { let myPower = curNodePowerAry() - console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower) +// console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower) if(Array.isArray(myPower) && myPower.length > 0){ let isOk = false myPower.forEach((item:powerAryInfo) => { @@ -764,8 +764,8 @@ const judgeIsDisabled = (key: string) => { } }) - console.log("判断是否禁用------key------->", key); - console.log("判断是否禁用------isOk------->", isOk); + // console.log("判断是否禁用------key------->", key); + // console.log("判断是否禁用------isOk------->", isOk); return isOk }else{ diff --git a/src/utils/request.ts b/src/utils/request.ts index 485f690..c903afa 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -60,8 +60,8 @@ service.interceptors.request.use( } // console.error('请求拦截---------->', randomString) // console.error('请求拦截----headers------>', headers) - console.log('请求拦截----config---url--->', config.url) - console.log('请求拦截----data------>', data) + // console.log('请求拦截----config---url--->', config.url) + // console.log('请求拦截----data------>', data) // console.error('请求拦截----config------>', config) // console.log('请求拦截----content-type------>', config.headers['Content-Type']) @@ -88,7 +88,7 @@ service.interceptors.response.use( let jsonData = sm4DecryptMethod(data.data, authKey) response.data.data = JSON.parse(jsonData) } - console.log('行营结果----解密结构------>', response.data) + // console.log('行营结果----解密结构------>', response.data) const { code, msg } = response.data; if (code === 0 || code === 200 || code === 10001) { return response.data; diff --git a/src/utils/workflow/const.ts b/src/utils/workflow/const.ts index 1fff71b..90275ff 100644 --- a/src/utils/workflow/const.ts +++ b/src/utils/workflow/const.ts @@ -57,7 +57,6 @@ export let notAsA_BasisForJudgment = [ "textarea", "timePicker", "colorPicker", - "switch", "inputNumber", "cascader", "rate", diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue index 64758f2..f6d62cd 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/unitsPageFrom/design.vue @@ -1955,13 +1955,13 @@ const setValue = (obj: { [key: string]: any }, filter?: boolean) => { // 表单组件值改变事件 tProp为子表格相关 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => { - // console.log("表单组件值改变事件----------1--------->", key); - // console.log("表单组件值改变事件----------2--------->", value); - // console.log("表单组件值改变事件----------3--------->", data); - // console.log("表单组件值改变事件----------4--------->", tProp); - // console.log("表单组件值改变事件----------5--------->", type); - // console.log("表单组件值改变事件----------6--------->", attribute); - // console.log("表单组件值改变事件----------11--------->", model.value); + console.log("表单组件值改变事件----------1--------->", key); + console.log("表单组件值改变事件----------2--------->", value); + console.log("表单组件值改变事件----------3--------->", data); + console.log("表单组件值改变事件----------4--------->", tProp); + console.log("表单组件值改变事件----------5--------->", type); + console.log("表单组件值改变事件----------6--------->", attribute); + console.log("表单组件值改变事件----------11--------->", model.value); let fieldVal: Record = {}; for (let i in model.value) { diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue index fdbd4da..7271b76 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue @@ -37,6 +37,10 @@ const props = defineProps({ nextStep:{ type:Number, default:0 + }, + loading:{ + type:Boolean, + default:false } }) const presetPersonnel = ref([]); //预设选择人 @@ -49,6 +53,7 @@ const flowList = computed({ emits("update:flowMap", val); }, }); +const flowLoading = computed(() => props.loading) watch(()=>props.flowMap,(val:any)=>{ emits("update:flowMap", val); @@ -58,11 +63,15 @@ onMounted(()=>{ }) //判断是否有增加人员按钮 const judgeAddUser = (val:any):boolean =>{ - console.log("val----->",val) + console.log("判断是否有增加人员按钮----->",val) if(val.customNode == "beginnode"){ val.runscope = val.runscope!=0?val.runscope:1 return true } + console.log("判断是否有增加人员按钮--isArray--->",Array.isArray(val.operator)) + if(!Array.isArray(val.operator)){ + return true + } switch(val.runtype){ case 1: val.runscope = val.runscope!=0?val.runscope:1 @@ -104,6 +113,8 @@ const addPeople = (val:any) =>{ selectedPeople.value = val.operator if(val.runscope == 1){ openclosebox.value = true + }if(val.runscope == 0){ + openclosebox.value = true }else{ openOrClose.value = true } @@ -131,7 +142,7 @@ const updateNode = (val:any) =>{ @ 功能: 判断审批节点样式 */ const judgeNodeClass = (val:number,stepVal:number):string => { - console.log("判断审批节点样式",val,stepVal) + // console.log("判断审批节点样式",val,stepVal) switch(val){ case 1: if(props.currentProgress == stepVal){ @@ -160,7 +171,7 @@ const judgeNodeClass = (val:number,stepVal:number):string => { } - +