zoucz 1 năm trước cách đây
mục cha
commit
67c56f2da3

+ 6 - 3
src/api/workflowManagement/index.ts

@@ -42,7 +42,8 @@ export function exportWorkFlowList(data: IGetWorkFlowList) {
 // 删除WorkFlow
 export function delWorkFlow(i_form_id: string) {
 	return request({
-		url: '/workflowList/' + i_form_id,
+		url: '/workflowList/delete',
+		data:{i_form_id:i_form_id},
 		method: key.DELETE
 	})
 }
@@ -430,15 +431,16 @@ export function saveGroupConfig(data: any) {
 	})
 }
 //=== 接口:角色管理 END ===
-
+//用户选择器个人
 export function getAllUser(data) {
 	return request({
-		url: '/alluser/list',
+		url: '/userDept/getUserDept',
 		data,
 		method: key.POST,
 	})
 }
 
+//用户选择器列表
 export function getAllUserList(data) {
 	return request({
 		url: '/userDept/getUserDeptList',
@@ -447,6 +449,7 @@ export function getAllUserList(data) {
 	})
 }
 
+//字典类主表
 export function getAllDict(data) {
 	return request({
 		url: '/alldict/getDict',

+ 1 - 1
src/lang/index.ts

@@ -35,7 +35,7 @@ const messages:any = ref({
 		'select.placeholder': '選択',
 	},
 })
-getLanguage({ i_func_id: 'ALL',i_language: Cookies.get('i_language'),login_user: '0000'}).then(res => {
+getLanguage({ i_func_id: 'ALL',i_language: Cookies.get('i_language')}).then(res => {
 	const data: any = {}
 	for(const key of Object.keys(res.data)){
 		data[String(key)] = res.data[key]

+ 0 - 3
src/views/login.vue

@@ -69,7 +69,6 @@ import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'
-import { getLanguage } from '@/api/workflowManagement/index';
 
 const userStore = useUserStore()
 const router = useRouter();
@@ -115,8 +114,6 @@ function handleLogin() {
       // 调用action的登录方法
       userStore.login(loginForm.value).then(() => {
         router.push({ path: redirect.value || "/" });
-        const res1 = getLanguage({ i_func_id: 'ALL',i_language: Cookies.get('i_language')});
-        data.Language = res1.data;
       }).catch(() => {
         loading.value = false;
         // 重新获取验证码

+ 3 - 1
src/views/workflowManagement/workflow/components/form.vue

@@ -51,6 +51,7 @@ import { useGlobalPinia } from '@/pinia/global'
 import { useRoutesStore } from '@/pinia/permission'
 import moment from 'moment'
 import { getDatePattern } from '@/components/GdElement/common';
+import { ElMessage } from 'element-plus'
 
 const { lang } = useGlobalPinia()
 const router = useRouter()
@@ -157,7 +158,8 @@ const handleSave = async () => {
   try {
     await saveWorkFlowConfig(params)
     ElMessage.success($t('common_0090'))
-    router.push({ name: 'WorkflowList' })
+    // router.push({ name: 'WorkflowList' })
+    router.push({path:'list'})
     routesStore.closeTag(currentRoute.name)
   } catch (e) {
     console.error(e)