소스 검색

优化流程保存

hubin 1 년 전
부모
커밋
87ca9bfa03
4개의 변경된 파일18개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 1
      src/api/flow/process.ts
  2. 3 3
      src/views/flow/create/components/BasicInfo.vue
  3. 11 4
      src/views/flow/group/components/listGroup.vue
  4. 3 5
      src/views/flow/group/index.vue

+ 1 - 1
src/api/flow/process.ts

@@ -59,7 +59,7 @@ function progressCloneApi(data: any): AxiosPromise {
 function processUpdateStateApi(data: any): AxiosPromise {
 	return request({
 		url: `${api.updateProcessState}-${data.id}` + '?state=' + data.state,
-		method: 'get'
+		method: 'post'
 	})
 }
 

+ 3 - 3
src/views/flow/create/components/BasicInfo.vue

@@ -3,7 +3,7 @@ import { storeToRefs } from 'pinia'
 import useFlowStore from '@/store/modules/flow'
 import { ref, nextTick, onMounted, computed, watch } from 'vue'
 import UseSelect from '@/components/scWorkflow/select'
-import flowDefinition from '@/api/flow/definition'
+import group from '@/api/flow/group'
 import { useRoute } from 'vue-router'
 import { flowIconPrefix } from '@/utils/index'
 const route = useRoute()
@@ -164,7 +164,7 @@ const delRole = (index, itemName) => {
 }
 
 const getGroupList = async () => {
-	const data = await flowDefinition.flowDefinitionListCategoryApi({})
+	const data = await group.flowGroupListAllApi({})
 	options.value = data || []
 }
 
@@ -251,7 +251,7 @@ defineExpose({
 				</el-form-item>
 				<el-form-item label="分组" prop="categoryId">
 					<el-select v-model="basicInfo.categoryId">
-						<el-option v-for="item in options" :key="item.categoryId" :label="item.categoryName" :value="item.categoryId" />
+						<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
 					</el-select>
 				</el-form-item>
 				<el-form-item v-if="false" label="谁可以发起该流程(不选择,默认全员)" prop="谁可以发起该流程">

+ 11 - 4
src/views/flow/group/components/listGroup.vue

@@ -50,6 +50,10 @@
 										</div>
 										<div class="group_itemIntro">{{ element.title }}</div>
 									</div>
+									<div class="group_itemSeeable">
+										<el-button type="primary" round>V{{ element.processVersion }}</el-button>
+										<el-button v-if="element.processState === 0" type="danger" round>已停用</el-button>
+									</div>
 									<div class="group_itemSeeable">{{ element.processKey }}</div>
 									<div class="group_itemOperations">
 										<el-space wrap>
@@ -63,8 +67,11 @@
 											</el-tooltip>
 										</el-space>
 										<el-space wrap>
-											<el-tooltip effect="dark" content="禁用" placement="top">
-												<el-icon :size="16" @click="enabledEv(element.processId)"><CircleClose /></el-icon>
+											<el-tooltip v-if="element.processState === 1" effect="dark" content="禁用" placement="top">
+												<el-icon :size="16" @click="enabledEv(element.processId, 0)"><CircleClose /></el-icon>
+											</el-tooltip>
+											<el-tooltip v-if="element.processState === 0" effect="dark" content="启用" placement="top">
+												<el-icon :size="16" @click="enabledEv(element.processId, 1)"><Check /></el-icon>
 											</el-tooltip>
 										</el-space>
 										<el-space wrap>
@@ -187,8 +194,8 @@ const stopEv = async (id: any) => {
 }
 
 // 禁用
-const enabledEv = async (id: any) => {
-	await process.processUpdateStateApi({ id, state: 0 })
+const enabledEv = async (id: any, state: number) => {
+	await process.processUpdateStateApi({ id, state: state })
 	flowGroupListAll()
 	console.log('禁用')
 }

+ 3 - 5
src/views/flow/group/index.vue

@@ -14,11 +14,9 @@
 								<el-space wrap><el-button type="primary" plain :icon="CircleCheck" @click="changeComponent('sort')">完 成</el-button></el-space>
 								<el-space wrap><el-button type="info" plain @click="changeComponent">取 消</el-button></el-space>
 							</template>
-							<el-space wrap
-								><el-button :type="sortFlag ? 'info' : 'primary'" :icon="Plus" :disabled="sortFlag" @click="createProcessEv"
-									>创建审批</el-button
-								></el-space
-							>
+							<el-space wrap>
+								<el-button :type="sortFlag ? 'info' : 'primary'" :icon="Plus" :disabled="sortFlag" @click="createProcessEv">创建审批</el-button>
+							</el-space>
 						</el-col>
 					</el-row>
 				</div>