Эх сурвалжийг харах

update 删除认领可直接办理,格式化代码

gssong 1 жил өмнө
parent
commit
3c34421bd2

+ 1 - 1
src/api/workflow/definitionConfig/types.ts

@@ -71,7 +71,7 @@ export interface DefinitionConfigForm extends BaseEntity {
   /**
    * 表单管理
    */
-  wfFormManageVo: FormManageVO;
+  wfFormManageVo?: FormManageVO;
 }
 
 export interface DefinitionConfigQuery extends PageQuery {

+ 0 - 6
src/api/workflow/formManage/types.ts

@@ -27,7 +27,6 @@ export interface FormManageVO {
    * 备注
    */
   remork: string;
-
 }
 
 export interface FormManageForm extends BaseEntity {
@@ -55,11 +54,9 @@ export interface FormManageForm extends BaseEntity {
    * 备注
    */
   remork?: string;
-
 }
 
 export interface FormManageQuery extends PageQuery {
-
   /**
    * 表单名称
    */
@@ -70,6 +67,3 @@ export interface FormManageQuery extends PageQuery {
    */
   formType?: string;
 }
-
-
-

+ 1 - 1
src/views/workflow/processDefinition/index.vue

@@ -274,7 +274,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const previewRef = ref<InstanceType<typeof ProcessPreview>>();
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
-const definitionConfigForm = ref<DefinitionConfigForm>();
+const definitionConfigForm = ref<DefinitionConfigForm>({});
 
 type CategoryOption = {
   categoryCode: string;

+ 1 - 24
src/views/workflow/task/taskWaiting.vue

@@ -60,30 +60,7 @@
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="scope">
-            <el-button
-              v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)"
-              type="primary"
-              size="small"
-              icon="Edit"
-              @click="handleOpen(scope.row)"
-              >办理</el-button
-            >
-            <el-button
-              v-if="scope.row.participantVo && scope.row.participantVo.claim === true"
-              type="primary"
-              size="small"
-              icon="Document"
-              @click="handleReturnTask(scope.row.id)"
-              >归还</el-button
-            >
-            <el-button
-              v-if="scope.row.participantVo && scope.row.participantVo.claim === false"
-              type="primary"
-              size="small"
-              icon="Document"
-              @click="handleClaimTask(scope.row.id)"
-              >认领</el-button
-            >
+            <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">办理</el-button>
           </template>
         </el-table-column>
       </el-table>