diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index 98a5a670d..c71c34c12 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -191,7 +191,8 @@ export function gainFlowPeople(data?: string[]){ //发起工作流 export function startRunFlow(data?:any){ return request({ - url: '/systemapi/task_flow/startRunFlow', + url: '/systemapi/task_management/startRunWorkFlow', + // url: '/systemapi/task_flow/startRunFlow', method: 'post', data: data }); @@ -207,7 +208,8 @@ export function taskFlowList(data?:taskflowquery){ //获取正在执行得任务流程 export function gainRunTaskFlow(data?:customerFormLogo){ return request({ - url: '/systemapi/task_flow/gainRunTaskFlow', + // url: '/systemapi/task_flow/gainRunTaskFlow', + url: '/systemapi/task_management/gainRunTaskWorkflow', method: 'post', data: data }); diff --git a/src/api/DesignForm/tableButton.ts b/src/api/DesignForm/tableButton.ts index 9a6f20609..d059536ce 100644 --- a/src/api/DesignForm/tableButton.ts +++ b/src/api/DesignForm/tableButton.ts @@ -132,3 +132,79 @@ export interface FormPageConfig{ searchFormIsShow:boolean, openPageMode:string } + + +export const submitButtonEs = { + type: "div", + control:{}, + config:{ + textAlign: "center", + span: "" + }, + list: [ + { + type: "button", + control:{ + label: "保存", + type: "primary", + key: "submit" + }, + config:{ + textAlign: "center" + } + } + ] +} +export const cancelButton = { + type: "div", + control:{}, + config:{ + textAlign: "center", + span: "" + }, + list: [ + { + type: "button", + control:{ + label: "返回", + type: "danger", + key: "cancel" + }, + config:{ + textAlign: "center" + } + } + ] +} +export const submitAndCancelButton = { + type: "div", + control:{}, + config:{ + span: 24, + textAlign: "center" + }, + list: [ + { + type: "button", + control:{ + label: "保存", + type: "primary", + key: "submit" + }, + config:{ + span: 0 + } + }, + { + type: "button", + control:{ + label: "返回", + type: "danger", + key: "cancel" + }, + config:{ + span: 0 + } + } + ] +}; diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts index 888ec0973..a05bfee96 100644 --- a/src/api/taskapi/management.ts +++ b/src/api/taskapi/management.ts @@ -74,3 +74,46 @@ export function generateFlow(data: nodeFlow):any{ data: data }); } + + +//获取任务表单内容 +export function gainTaskFormInfo(data: customerFormLogo):AxiosPromise { + return request({ + url: '/systemapi/task_management/gainTaskFormInfo', + method: 'post', + data: data + }); +} +//获取工作流步进节点 +export function softDeletion(data: any):any{ + return request({ + url: '/systemapi/task_management/softDeletion', + method: 'post', + data: data + }); +} +//获取修改记录 +export function gainEditDataLog(data: any):any{ + return request({ + url: '/systemapi/task_management/gainEditDataLog', + method: 'post', + data: data + }); +} + +//添加任务是回显表单数据，若有流程回显流程 +export function echoTableFormPage(data: any):any{ + return request({ + url: '/systemapi/task_management/echoTableFormPage', + method: 'post', + data: data + }); +} +//根据表单数据实时更新流程 +export function realTimeUpdateFlow(data: any):any{ + return request({ + url: '/systemapi/task_management/realTimeUpdateFlow', + method: 'post', + data: data + }); +} diff --git a/src/assets/scss/form.css b/src/assets/scss/form.css index 203f2a9a0..33b2749ad 100644 --- a/src/assets/scss/form.css +++ b/src/assets/scss/form.css @@ -572,18 +572,10 @@ width: 23%; } -.detail-form { - min-height: calc(100vh - 170px); -} - .detail-form > div { height: 100%; } -.detail-form > .drag { - min-height: calc(100vh - 170px) !important; -} - .detail-form .ghost { background: #F56C6C; border: 2px solid #F56C6C; diff --git a/src/assets/scss/form.min.css b/src/assets/scss/form.min.css index 4a57ccf15..527e06741 100644 --- a/src/assets/scss/form.min.css +++ b/src/assets/scss/form.min.css @@ -1 +1 @@ -.design-container{margin:10px !important;display:flex;background-color:#FFFFFF}.components-list{width:250px;padding:8px 0;overflow-y:auto;height:calc(100vh - 40px);position:relative;overflow-x:hidden}.components-list .title{padding:8px 12px;position:relative}.components-list .title .template{position:absolute;right:12px;top:0;padding:8px;cursor:pointer}.components-list ul{position:relative;overflow:hidden;padding:0 10px 10px;margin:0}.components-list ul li{font-size:13px;display:flex;width:48%;line-height:28px;position:relative;float:left;left:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0 1% 5px;color:#333;padding:0 10px;border:1px solid transparent;background:#f4f6fc;user-select:none;align-items:center}.components-list ul li i{margin-right:5px}.components-list ul li:hover{color:#66b1ff;border:1px dashed #66b1ff;cursor:move}.components-list ul li.title{padding:0 10px}.components-list .content{margin-left:12px}.use-template{position:absolute;left:-100%;top:0;width:100%;bottom:0;background:#fff;opacity:0}.use-template.active{animation:templateAni .5s forwards}.use-template .close{position:absolute;right:5px;top:5px;font-size:14px;cursor:pointer}.use-template .list{padding:30px 10px;overflow-y:auto}.use-template .list .item{box-shadow:0 0 4px rgba(0,21,41,0.1);padding:10px;text-align:center;transition:all .5s;cursor:pointer;margin-bottom:10px}.use-template .list .item img{display:block;width:100%;margin:0 auto 10px}.use-template .list .item:hover{box-shadow:0 0 4px rgba(0,21,41,0.25)}.use-template .no-date{text-align:center;padding-top:20px;color:#999}@keyframes templateAni{100%{opacity:1;left:0}}.main-body{flex:2;border-left:1px solid #e0e0e0;border-right:1px solid #e0e0e0;margin:0;overflow:hidden}.main-body .empty-tips{text-align:center;width:100%;font-size:20px;color:#ccc;position:absolute;left:0;top:100px}.main-body .main-form{background:#fff;border:1px dashed #999;margin:10px;height:calc(100vh - 105px);overflow-y:auto;overflow-x:hidden;position:relative}.main-tools{line-height:26px;border-bottom:2px solid #e4e7ed;margin-right:10px;padding:8px 0;display:flex;align-items:center;justify-content:flex-end}.main-tools button{color:#66b1ff}.main-tools button i{padding-right:5px}.add-form{padding:0px;box-sizing:border-box}.add-form .form-row .form-col.active-col{border:3px solid #66b1ff;position:relative}.add-form .form-row .form-col.active-col>.drag-control{display:block}.add-form .form-row .form-col.active-col>.tooltip{display:block}.add-form .title{border-bottom:1px solid #ddd;font-weight:700;font-size:14px;height:30px;padding:0 5px;margin-bottom:22px}.add-form .form-tabs .drag{min-height:80px}.add-form .group-card .el-collapse{border:0}.add-form .group-card .el-collapse-item__header{font-weight:700;border-bottom:1px solid #ddd;margin-bottom:20px}.add-form .group-card .el-collapse-item__wrap{border:0}.add-form .group-inputSlot{display:none}.add-form .form-table{margin-bottom:22px}.add-form .form-table .drag{border:0;display:flex;overflow-x:auto;white-space:nowrap;padding:0;flex-wrap:nowrap}.add-form .form-table .drag>div{min-width:150px;width:auto}.add-form .form-table .el-form-item{display:block}.add-form .table-btn{padding-top:10px}.add-form .el-collapse-item__content{padding-bottom:5px}.add-form .form-table-add .el-form-item__label{display:none}.add-form .form-table-add .el-form-item{margin:0}.add-form .form-table-add .el-table .cell{overflow:inherit}.add-form .form-table-add .el-table .cell .el-form-item__error{padding-top:0}.add-form .gray{color:#999}.add-form>.drag{border:0 !important}.add-form .group-flex .flex-group{display:flex;justify-content:space-between}.add-form .group-flex .flex-group button{margin-left:10px}.add-form .group-flex .flex-item{flex:2}.add-form .group-txt{margin-bottom:18px}.add-form .div-layout.right .drag{text-align:right;justify-content:flex-end}.add-form .div-layout.center .drag{text-align:center;justify-content:center}.add-form .el-select{width:100%}.add-form .el-select .el-input__wrapper .el-input__suffix{position:absolute;right:10px}.add-form .group{width:100%}.add-form .drag{display:flex;flex-wrap:wrap}.add-form.form-row-2 .group{width:50%}.add-form.form-row-3 .group{width:33%}.add-form.form-row-4 .group{width:25%}.sidebar-tools{width:300px;right:0;top:0;overflow-y:auto;box-sizing:border-box;padding-bottom:10px;bottom:0;height:calc(100vh - 40px)}.sidebar-tools .form .el-form-item{margin-bottom:10px}.sidebar-tools .h3{font-size:14px;margin-bottom:10px;display:flex;align-items:center}.sidebar-tools .h3 h3{font-size:14px}.sidebar-tools .el-tabs__nav-wrap{padding:0 10px}.sidebar-tools .el-tabs__content{padding:0 10px}.sidebar-tools .icon-del{cursor:pointer}.sidebar-tools .option-radio>label{margin-right:8px}.sidebar-tools .event-btn button{margin:0 12px 5px 0}#editJson,#editJsonCopy{width:100%;height:calc(100vh - 65px)}#editJsonCopy{height:calc(100vh - 350px)}.ace-dialog{background:#1e1e1e}.ace-dialog .el-drawer__body{padding:0}.ace-dialog .el-drawer__header{margin:0;color:#e9e9e9;font-size:12px;padding:3px 10px}.ace-dialog .dialog-footer{text-align:center;padding-top:5px}.export-dialog .el-dialog__body{padding:0 20px}.design-form{min-height:calc(100vh - 170px)}.design-form>div{height:100%}.design-form>.drag{min-height:calc(100vh - 170px) !important}.design-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.design-form .group{border:1px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.design-form .group.active{border:3px solid #66b1ff;position:relative}.design-form .group.active>.drag-control{display:block}.design-form .group.active>.tooltip{display:block}.design-form .group:hover{border-color:#66b1ff;background:#ecf5ff}.design-form .group>div{margin-bottom:0}.design-form .group:after{content:'';position:absolute;left:0;top:0;right:0;bottom:0;opacity:0;z-index:1;display:block}.design-form .group.group-grid:after,.design-form .group.group-tabs:after,.design-form .group.group-card:after,.design-form .group.group-flex:after,.design-form .group.group-div:after,.design-form .group.group-table:after{display:none}.design-form .group-inputSlot{border-color:#eebe77;display:inline-block}.design-form .group-inputSlot:hover,.design-form .group-inputSlot.active{border-color:#eebe77 !important}.design-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.design-form .drag-control{display:none}.design-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.design-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.design-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.design-form .drag{height:100%;border:1px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.design-form.form-row-2 .group{width:48%}.design-form.form-row-3 .group{width:32%}.design-form.form-row-4 .group{width:23%}.detail-form{min-height:calc(100vh - 170px)}.detail-form>div{height:100%}.detail-form>.drag{min-height:calc(100vh - 170px) !important}.detail-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.detail-form .group{border:0px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.detail-form .group>div{margin-bottom:0}.detail-form .group-inputSlot{border-color:#eebe77;display:inline-block}.detail-form .group-inputSlot:hover,.detail-form .group-inputSlot.active{border-color:#eebe77 !important}.detail-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.detail-form .drag-control{display:none}.detail-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.detail-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.detail-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.detail-form .drag{height:100%;border:0px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.detail-form.form-row-2 .group{width:48%}.detail-form.form-row-3 .group{width:32%}.detail-form.form-row-4 .group{width:23%}.design-table .main-body{border-left:0}.design-table .header{position:relative}.design-table .header .field{position:absolute;left:10px;top:7px;display:flex}.design-table .components-list .content{padding:0 12px}.design-table .components-list .content>div{display:flex;flex-wrap:wrap;justify-content:flex-start}.design-table .components-list .content>div label{margin:0 10px 8px 0 !important}.design-table .main-table{padding:10px 20px}.design-table .main-table .add-form{min-height:auto;display:flex}.design-table .main-table .add-form>.drag{height:auto;min-height:auto !important}.design-table .main-table .el-divider{margin:8px 0 0}.design-table .main-table .table-tip{color:#999;padding:30px 0;line-height:22px}.design-table .main-table .search-box{position:relative}.design-table .main-table .search-box:after{content:'';width:100%;height:100%;position:absolute;left:0;right:0;bottom:0;top:0;z-index:2;cursor:pointer}.design-table .main-table .search-box .group{width:auto;margin-right:10px}.design-table .main-table .control-btn{padding:10px 0;margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.design-table .main-table .tip{border:1px dotted #ddd;padding:3px 5px;border-radius:5px;color:#999;text-align:center;cursor:pointer}.design-table .main-table .el-table__header th .cell{position:relative}.design-table .main-table .el-table__header th .icon-close{display:none;font-size:12px;margin-left:12px;cursor:pointer;position:absolute}.design-table .main-table .el-table__header th:hover .icon-close{display:inline-block}.design-table .table-tag .el-form-item__content{display:flex}.design-table .table-tag .el-form-item__content>div{flex:2;margin-right:5px}.table-field-list h3{font-size:14px}.table-field-list .item{margin-bottom:20px}.table-field-list .list{display:flex;justify-content:flex-start;flex-wrap:wrap}.table-field-list .list label{width:25%;margin:0}.table-list-comm{display:flex;justify-content:space-between}.table-list-comm .tree-sidebar{width:180px;border-right:1px solid #ddd;padding-right:10px;margin-right:10px;flex-shrink:0}.table-list-comm .tree-sidebar .el-input{margin-bottom:10px}.table-list-comm .table-list{display:block;width:100%}.table-list-comm .table-main{margin-bottom:20px}.table-list-comm .table-main.hide-vertical-scroll .el-scrollbar__wrap{overflow:hidden}.table-list-comm .table-main.hide-vertical-scroll .is-vertical{display:none !important}.table-list-comm .table-main .table-operate-btn{display:flex;align-items:center}.table-list-comm .table-search{position:relative}.table-list-comm .table-search form{display:flex;flex-wrap:wrap;padding-bottom:0;border-bottom:1px solid #dcdfe6;margin-bottom:10px}.table-list-comm .table-search .drag{display:flex;flex-wrap:wrap}.table-list-comm .table-search .drag>div{margin-right:10px}.table-list-comm .table-search .group{width:auto}.table-list-comm .table-search .search-icon{margin-left:10px;height:30px;cursor:pointer;position:absolute;right:0;top:0}.table-list-comm .table-search .autoHeight-enter-active,.table-list-comm .table-search .autoHeight-leave-active{max-height:200px;transition:all .6s;overflow:hidden}.table-list-comm .table-search .autoHeight-enter-from,.table-list-comm .table-search .autoHeight-leave-to{max-height:0}.table-list-comm .control-btn{margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.upload-style .limit .el-upload{display:none}.upload-style .el-upload-list__item-preview{display:none !important}.upload-style .el-upload--picture .icon-plus{font-size:28px;display:flex;align-items:center;justify-content:center;color:#8c939d;width:148px;height:148px;border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;overflow:hidden;background:#fbfdff}.table-page{padding-top:10px;display:flex;justify-content:flex-end} +.design-container{margin:10px !important;display:flex;background-color:#FFFFFF}.components-list{width:250px;padding:8px 0;overflow-y:auto;height:calc(100vh - 40px);position:relative;overflow-x:hidden}.components-list .title{padding:8px 12px;position:relative}.components-list .title .template{position:absolute;right:12px;top:0;padding:8px;cursor:pointer}.components-list ul{position:relative;overflow:hidden;padding:0 10px 10px;margin:0}.components-list ul li{font-size:13px;display:flex;width:48%;line-height:28px;position:relative;float:left;left:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0 1% 5px;color:#333;padding:0 10px;border:1px solid transparent;background:#f4f6fc;user-select:none;align-items:center}.components-list ul li i{margin-right:5px}.components-list ul li:hover{color:#66b1ff;border:1px dashed #66b1ff;cursor:move}.components-list ul li.title{padding:0 10px}.components-list .content{margin-left:12px}.use-template{position:absolute;left:-100%;top:0;width:100%;bottom:0;background:#fff;opacity:0}.use-template.active{animation:templateAni .5s forwards}.use-template .close{position:absolute;right:5px;top:5px;font-size:14px;cursor:pointer}.use-template .list{padding:30px 10px;overflow-y:auto}.use-template .list .item{box-shadow:0 0 4px rgba(0,21,41,0.1);padding:10px;text-align:center;transition:all .5s;cursor:pointer;margin-bottom:10px}.use-template .list .item img{display:block;width:100%;margin:0 auto 10px}.use-template .list .item:hover{box-shadow:0 0 4px rgba(0,21,41,0.25)}.use-template .no-date{text-align:center;padding-top:20px;color:#999}@keyframes templateAni{100%{opacity:1;left:0}}.main-body{flex:2;border-left:1px solid #e0e0e0;border-right:1px solid #e0e0e0;margin:0;overflow:hidden}.main-body .empty-tips{text-align:center;width:100%;font-size:20px;color:#ccc;position:absolute;left:0;top:100px}.main-body .main-form{background:#fff;border:1px dashed #999;margin:10px;height:calc(100vh - 105px);overflow-y:auto;overflow-x:hidden;position:relative}.main-tools{line-height:26px;border-bottom:2px solid #e4e7ed;margin-right:10px;padding:8px 0;display:flex;align-items:center;justify-content:flex-end}.main-tools button{color:#66b1ff}.main-tools button i{padding-right:5px}.add-form{padding:0px;box-sizing:border-box}.add-form .form-row .form-col.active-col{border:3px solid #66b1ff;position:relative}.add-form .form-row .form-col.active-col>.drag-control{display:block}.add-form .form-row .form-col.active-col>.tooltip{display:block}.add-form .title{border-bottom:1px solid #ddd;font-weight:700;font-size:14px;height:30px;padding:0 5px;margin-bottom:22px}.add-form .form-tabs .drag{min-height:80px}.add-form .group-card .el-collapse{border:0}.add-form .group-card .el-collapse-item__header{font-weight:700;border-bottom:1px solid #ddd;margin-bottom:20px}.add-form .group-card .el-collapse-item__wrap{border:0}.add-form .group-inputSlot{display:none}.add-form .form-table{margin-bottom:22px}.add-form .form-table .drag{border:0;display:flex;overflow-x:auto;white-space:nowrap;padding:0;flex-wrap:nowrap}.add-form .form-table .drag>div{min-width:150px;width:auto}.add-form .form-table .el-form-item{display:block}.add-form .table-btn{padding-top:10px}.add-form .el-collapse-item__content{padding-bottom:5px}.add-form .form-table-add .el-form-item__label{display:none}.add-form .form-table-add .el-form-item{margin:0}.add-form .form-table-add .el-table .cell{overflow:inherit}.add-form .form-table-add .el-table .cell .el-form-item__error{padding-top:0}.add-form .gray{color:#999}.add-form>.drag{border:0 !important}.add-form .group-flex .flex-group{display:flex;justify-content:space-between}.add-form .group-flex .flex-group button{margin-left:10px}.add-form .group-flex .flex-item{flex:2}.add-form .group-txt{margin-bottom:18px}.add-form .div-layout.right .drag{text-align:right;justify-content:flex-end}.add-form .div-layout.center .drag{text-align:center;justify-content:center}.add-form .el-select{width:100%}.add-form .el-select .el-input__wrapper .el-input__suffix{position:absolute;right:10px}.add-form .group{width:100%}.add-form .drag{display:flex;flex-wrap:wrap}.add-form.form-row-2 .group{width:50%}.add-form.form-row-3 .group{width:33%}.add-form.form-row-4 .group{width:25%}.sidebar-tools{width:300px;right:0;top:0;overflow-y:auto;box-sizing:border-box;padding-bottom:10px;bottom:0;height:calc(100vh - 40px)}.sidebar-tools .form .el-form-item{margin-bottom:10px}.sidebar-tools .h3{font-size:14px;margin-bottom:10px;display:flex;align-items:center}.sidebar-tools .h3 h3{font-size:14px}.sidebar-tools .el-tabs__nav-wrap{padding:0 10px}.sidebar-tools .el-tabs__content{padding:0 10px}.sidebar-tools .icon-del{cursor:pointer}.sidebar-tools .option-radio>label{margin-right:8px}.sidebar-tools .event-btn button{margin:0 12px 5px 0}#editJson,#editJsonCopy{width:100%;height:calc(100vh - 65px)}#editJsonCopy{height:calc(100vh - 350px)}.ace-dialog{background:#1e1e1e}.ace-dialog .el-drawer__body{padding:0}.ace-dialog .el-drawer__header{margin:0;color:#e9e9e9;font-size:12px;padding:3px 10px}.ace-dialog .dialog-footer{text-align:center;padding-top:5px}.export-dialog .el-dialog__body{padding:0 20px}.design-form{min-height:calc(100vh - 170px)}.design-form>div{height:100%}.design-form>.drag{min-height:calc(100vh - 170px) !important}.design-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.design-form .group{border:1px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.design-form .group.active{border:3px solid #66b1ff;position:relative}.design-form .group.active>.drag-control{display:block}.design-form .group.active>.tooltip{display:block}.design-form .group:hover{border-color:#66b1ff;background:#ecf5ff}.design-form .group>div{margin-bottom:0}.design-form .group:after{content:'';position:absolute;left:0;top:0;right:0;bottom:0;opacity:0;z-index:1;display:block}.design-form .group.group-grid:after,.design-form .group.group-tabs:after,.design-form .group.group-card:after,.design-form .group.group-flex:after,.design-form .group.group-div:after,.design-form .group.group-table:after{display:none}.design-form .group-inputSlot{border-color:#eebe77;display:inline-block}.design-form .group-inputSlot:hover,.design-form .group-inputSlot.active{border-color:#eebe77 !important}.design-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.design-form .drag-control{display:none}.design-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.design-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.design-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.design-form .drag{height:100%;border:1px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.design-form.form-row-2 .group{width:48%}.design-form.form-row-3 .group{width:32%}.design-form.form-row-4 .group{width:23%}.detail-form>div{height:100%}.detail-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.detail-form .group{border:0px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.detail-form .group>div{margin-bottom:0}.detail-form .group-inputSlot{border-color:#eebe77;display:inline-block}.detail-form .group-inputSlot:hover,.detail-form .group-inputSlot.active{border-color:#eebe77 !important}.detail-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.detail-form .drag-control{display:none}.detail-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.detail-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.detail-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.detail-form .drag{height:100%;border:0px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.detail-form.form-row-2 .group{width:48%}.detail-form.form-row-3 .group{width:32%}.detail-form.form-row-4 .group{width:23%}.design-table .main-body{border-left:0}.design-table .header{position:relative}.design-table .header .field{position:absolute;left:10px;top:7px;display:flex}.design-table .components-list .content{padding:0 12px}.design-table .components-list .content>div{display:flex;flex-wrap:wrap;justify-content:flex-start}.design-table .components-list .content>div label{margin:0 10px 8px 0 !important}.design-table .main-table{padding:10px 20px}.design-table .main-table .add-form{min-height:auto;display:flex}.design-table .main-table .add-form>.drag{height:auto;min-height:auto !important}.design-table .main-table .el-divider{margin:8px 0 0}.design-table .main-table .table-tip{color:#999;padding:30px 0;line-height:22px}.design-table .main-table .search-box{position:relative}.design-table .main-table .search-box:after{content:'';width:100%;height:100%;position:absolute;left:0;right:0;bottom:0;top:0;z-index:2;cursor:pointer}.design-table .main-table .search-box .group{width:auto;margin-right:10px}.design-table .main-table .control-btn{padding:10px 0;margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.design-table .main-table .tip{border:1px dotted #ddd;padding:3px 5px;border-radius:5px;color:#999;text-align:center;cursor:pointer}.design-table .main-table .el-table__header th .cell{position:relative}.design-table .main-table .el-table__header th .icon-close{display:none;font-size:12px;margin-left:12px;cursor:pointer;position:absolute}.design-table .main-table .el-table__header th:hover .icon-close{display:inline-block}.design-table .table-tag .el-form-item__content{display:flex}.design-table .table-tag .el-form-item__content>div{flex:2;margin-right:5px}.table-field-list h3{font-size:14px}.table-field-list .item{margin-bottom:20px}.table-field-list .list{display:flex;justify-content:flex-start;flex-wrap:wrap}.table-field-list .list label{width:25%;margin:0}.table-list-comm{display:flex;justify-content:space-between}.table-list-comm .tree-sidebar{width:180px;border-right:1px solid #ddd;padding-right:10px;margin-right:10px;flex-shrink:0}.table-list-comm .tree-sidebar .el-input{margin-bottom:10px}.table-list-comm .table-list{display:block;width:100%}.table-list-comm .table-main{margin-bottom:20px}.table-list-comm .table-main.hide-vertical-scroll .el-scrollbar__wrap{overflow:hidden}.table-list-comm .table-main.hide-vertical-scroll .is-vertical{display:none !important}.table-list-comm .table-main .table-operate-btn{display:flex;align-items:center}.table-list-comm .table-search{position:relative}.table-list-comm .table-search form{display:flex;flex-wrap:wrap;padding-bottom:0;border-bottom:1px solid #dcdfe6;margin-bottom:10px}.table-list-comm .table-search .drag{display:flex;flex-wrap:wrap}.table-list-comm .table-search .drag>div{margin-right:10px}.table-list-comm .table-search .group{width:auto}.table-list-comm .table-search .search-icon{margin-left:10px;height:30px;cursor:pointer;position:absolute;right:0;top:0}.table-list-comm .table-search .autoHeight-enter-active,.table-list-comm .table-search .autoHeight-leave-active{max-height:200px;transition:all .6s;overflow:hidden}.table-list-comm .table-search .autoHeight-enter-from,.table-list-comm .table-search .autoHeight-leave-to{max-height:0}.table-list-comm .control-btn{margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.upload-style .limit .el-upload{display:none}.upload-style .el-upload-list__item-preview{display:none !important}.upload-style .el-upload--picture .icon-plus{font-size:28px;display:flex;align-items:center;justify-content:center;color:#8c939d;width:148px;height:148px;border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;overflow:hidden;background:#fbfdff}.table-page{padding-top:10px;display:flex;justify-content:flex-end} diff --git a/src/assets/scss/form.scss b/src/assets/scss/form.scss index 282530c07..149e3a5cf 100644 --- a/src/assets/scss/form.scss +++ b/src/assets/scss/form.scss @@ -194,9 +194,9 @@ $mainColor: #66b1ff; .group {width: 23%} } } -.detail-form {min-height: calc(100vh - 170px); +.detail-form { > div {height: 100%} - > .drag {min-height: calc(100vh - 170px) !important;} + // > .drag {min-height: calc(100vh - 170px) !important;} .ghost { background: #F56C6C; border: 2px solid #F56C6C; diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 2614e184d..9a3e912fd 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -412,9 +412,11 @@ provide(constFormBtnEvent, (obj: any) => { break case 'saveDraft': //保存草稿 saveDraft() // 保存草稿 + // console.log("保存草稿--------->saveDraft") break case "saveEditDraft": //保存草稿 只保存表单不操作流程 - saveEditDraft() + // saveEditDraft() + console.log("保存草稿--------->saveEditDraft") break case 'afreshSubmit': //重新提交流程 afreshSubmit() // 提交 @@ -506,10 +508,12 @@ const getData = (params = {}) => { requestUrl ="/systemapi/task_management/add_form_data" break; case "editFormContent": - requestUrl ="/systemapi/task_management/newcust_form_editdata" + // requestUrl ="/systemapi/task_management/newcust_form_editdata" + requestUrl ="/systemapi/task_management/add_customer_form" break; default: } + loading.value = true const newParams: any = params // 同时可使用props或是events里的事件，根据使用使用其中一种即可 @@ -572,6 +576,8 @@ const submit = (params = {}) => { let addUrl = props.formData.config?.addUrl || props.addUrl let editUrl = props.formData.config?.editUrl || props.editUrl let apiUrl = props.type === 1 ? addUrl : editUrl + + console.log("新增、查看、保存数据",props.type,props.addUrl,props.editUrl) if (props.isSearch || !apiUrl || loading.value) { if (!props.isSearch && !apiUrl) { console.error( @@ -592,18 +598,17 @@ const submit = (params = {}) => { apiUrl ="/systemapi/task_management/add_customer_form" break; case "editFormContent": - apiUrl ="/systemapi/task_management/newcust_form_editdata" + apiUrl ="/systemapi/task_management/editCustomerTable" break; default: } - validate((valid: boolean, fields: any) => { if (valid) { const formatParams = Object.assign({}, fields, params) console.log("params--->",params) - console.log("fields--->",fields) + console.log("fields--->",fields) console.log("formatParams-Object-->",formatParams) let submitParams @@ -623,19 +628,20 @@ const submit = (params = {}) => { if (submitParams === false) { return } - console.log("beforeSubmit--->",beforeSubmit) - console.log("props.beforeSubmit--->",props.beforeSubmit) + // console.log("beforeSubmit--->",beforeSubmit) + // console.log("props.beforeSubmit--->",props.beforeSubmit) // console.log("props.beforeSubmit--->",props.beforeSubmit) // loading.value = true - console.log("apiUrl--->",apiUrl) - console.log("submitParams--->",submitParams) - console.log("formatParams--->",formatParams) + // console.log("apiUrl--->",apiUrl) + // console.log("submitParams--->",submitParams) + // console.log("formatParams--->",formatParams) // debugger // 提交保存表单 currencyFormApiSubmit(apiUrl, submitParams ?? formatParams) .then((res: any) => { + console.log("formatParams--111->",res) afterSubmit('success', res) }) .catch(res => { @@ -725,7 +731,8 @@ onUnmounted(() => { //重洗提交表单流程 const afreshSubmit = (params = {}) => { - let apiUrl = "/systemapi/task_management/newcust_form_editdata" + // let apiUrl = "/systemapi/task_management/newcust_form_editdata" + let apiUrl ="/systemapi/task_management/add_customer_form" if (props.isSearch || !apiUrl || loading.value) { if (!props.isSearch && !apiUrl) { console.error( @@ -862,7 +869,8 @@ const saveDraftPage = (type: string, res: any) => { } //保存草稿 只保存表单，不操作流程 const saveEditDraft = (params = {}) => { - let apiUrl = "/systemapi/task_management/newcust_form_editdata" + // let apiUrl = "/systemapi/task_management/newcust_form_editdata" + let apiUrl ="/systemapi/task_management/add_customer_form" if (props.isSearch || !apiUrl || loading.value) { if (!props.isSearch && !apiUrl) { console.error( @@ -931,7 +939,8 @@ const saveEditFormInfo = (type: string, res: any) => { * 草稿提交审批 */ const draftSubmit = (params = {}) => { - let apiUrl = "/systemapi/task_management/newcust_form_editdata" + // let apiUrl = "/systemapi/task_management/newcust_form_editdata" + let apiUrl ="/systemapi/task_management/add_customer_form" if (props.isSearch || !apiUrl || loading.value) { if (!props.isSearch && !apiUrl) { console.error( @@ -1102,6 +1111,7 @@ defineExpose({ + diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 13d950c7f..e3473252c 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -9,10 +9,16 @@ import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router' import { useDesignFormStore } from '@/store/DesignForm/designForm' import { attrButton,FormPageList,FormPageConfig } from '@/api/DesignForm/tableButton' import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/DesignForm/fieldUnit' -import type { FormInstance, FormRules } from 'element-plus' +import type { FormInstance, FormRules,ElNotification } from 'element-plus' import { gainFormPageListCont } from '@/api/DesignForm/requestapi' import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue' +import { softDeletion } from '@/api/taskapi/management' + + +//引入组件 +import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue' + const props = withDefaults( defineProps<{ data: FormPageList @@ -65,6 +71,7 @@ const emits = defineEmits<{ (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件 }>() +const idList = ref([]) const designStore = useDesignFormStore() const route = useRoute() const router = useRouter() @@ -275,23 +282,61 @@ const judjeSwitch = (val:any,yesVal:any) => { /** @ 作者: 秦东 @ 时间: 2024-04-03 13:13:56 -@ 功能: 列表信息删除安妮 +@ 功能: 列表信息删除信息 */ const confirmEvent = (val:any) => { - console.log('confirm!',val) + let sendData = { + id:[val.masters_key], + isTrue:2 + } + softDeletion(sendData) + .then((data)=>{ + console.log('cancel!',data) + ElNotification({ + title: '温馨提示！', + message: data.mag, + type: 'success', + }) + getPageData() + }) } const cancelEvent = (val:any) => { console.log('cancel!',val) } +const container = ref() //实例化内容容器 +const drawerWith = ref(); //编辑表单时抽屉宽度 /** @ 作者: 秦东 @ 时间: 2024-04-03 13:24:06 @ 功能: 查看详细内容 */ -const lookPageInfo = (val:any) => {} +const tablePageClass = ref(1) +const lookPageInfoIsShow = ref(false) +const pageInfoCont = ref() +const lookPageInfo = (val:any) => { + tablePageClass.value = 4; + pageInfoCont.value = val + drawerWith.value = container.value?.clientWidth + lookPageInfoIsShow.value = true; + +} +/** +@ 作者: 秦东 +@ 时间: 2024-04-05 11:29:50 +@ 功能: 编辑表单内容 +*/ + +const editInfo = (val:any) => { + console.log('修改数据!',val) + tablePageClass.value = 2; + pageInfoCont.value = val + drawerWith.value = container.value?.clientWidth + lookPageInfoIsShow.value = true; +}