houyaf пре 3 година
родитељ
комит
2da4ac5d5f

+ 1 - 1
src/api/index.ts

@@ -12,7 +12,7 @@ export function signIn(data: any) {
 // 获取授权
 export function getPermit() {
   return apiRequest({
-    url: '/user/permit',
+    url: '/app/user/permit',
     method: 'GET',
   })
 }

+ 0 - 128
src/api/system/entApi.ts

@@ -1,128 +0,0 @@
-import apiRequest from '@/network/http/apiRequest'
-
-/**
- * 获取列表
- * @param data
- * @returns
- */
-export function getEntByPage(data: any) {
-  return apiRequest({
-    url: '/ent/page',
-    method: 'GET',
-    params: data,
-  })
-}
-
-/**
- * 获取管理员
- * @param ocId
- * @returns
- */
-export function getEntAdmin(ocId: number) {
-  return apiRequest({
-    url: `/ent/getAdmin/${ocId}`,
-    method: 'GET',
-  })
-}
-
-/**
- * 新增管理员
- * @param data
- * @returns
- */
-export function createEntAdmin(data: any) {
-  return apiRequest({
-    url: '/ent/addAdmin',
-    method: 'POST',
-    data,
-  })
-}
-
-/**
- * 更新管理员
- * @param data
- * @returns
- */
-export function updateEntAdmin(data: any) {
-  return apiRequest({
-    url: '/ent/updateAdmin',
-    method: 'PUT',
-    data,
-  })
-}
-
-/**
- * 重置管理员密码
- * @returns
- * @param ocId
- * @param adminId
- */
-export function resetAdminPwd(ocId: number, adminId: number) {
-  return apiRequest({
-    url: `/ent/resetAdminPwd/${ocId}/${adminId}`,
-    method: 'PUT',
-  })
-}
-
-/**
- * 根据ID获取企业信息
- * @returns
- * @param ocId
- */
-export function getEntById(ocId: number) {
-  return apiRequest({
-    url: `/ent/${ocId}`,
-    method: 'GET',
-  })
-}
-
-/**
- * 添加企业
- * @param data
- * @returns
- */
-export function createEnt(data: any) {
-  return apiRequest({
-    url: '/ent/add',
-    method: 'POST',
-    data,
-  })
-}
-
-/**
- * 更新企业
- * @param data
- * @returns
- */
-export function updateEnt(data: any) {
-  return apiRequest({
-    url: '/ent/update',
-    method: 'PUT',
-    data,
-  })
-}
-
-/**
- * 删除企业
- * @returns
- * @param ocId
- */
-export function deleteEntById(ocId: number) {
-  return apiRequest({
-    url: `/ent/${ocId}`,
-    method: 'DELETE',
-  })
-}
-
-/**
- * 更新企业状态
- * @returns
- * @param ocId
- * @param status
- */
-export function updateEntStatus(ocId: number, status: number) {
-  return apiRequest({
-    url: `/ent/updateStatus/${ocId}/${status}`,
-    method: 'PUT',
-  })
-}

+ 81 - 0
src/api/system/wfActivityActionDefApi.ts

@@ -0,0 +1,81 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询流程Activity Action定义
+ * @param data
+ * @returns
+ */
+export function getWfActivityActionDefByPage(data: any) {
+  return apiRequest({
+    url: '/wf/activity/action/def/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 列表查询流程Activity Action定义
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
+ */
+export function getWfActivityActionDefByList(wfDefId: number, activityDefId: number) {
+  return apiRequest({
+    url: `/wf/activity/action/def/${wfDefId}/${activityDefId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 基于ID查询流程Activity Action定义
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
+ * @param actionId
+ */
+export function getWfActivityActionDefById(wfDefId: number, activityDefId: number, actionId: number) {
+  return apiRequest({
+    url: `/wf/activity/action/def/${wfDefId}/${activityDefId}/${actionId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加流程Activity Action定义
+ * @param data
+ * @returns
+ */
+export function createWfActivityActionDef(data: any) {
+  return apiRequest({
+    url: '/wf/activity/action/def/add',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 更新流程Activity Action定义
+ * @param data
+ * @returns
+ */
+export function updateWfActivityActionDef(data: any) {
+  return apiRequest({
+    url: '/wf/activity/action/def/update',
+    method: 'PUT',
+    data,
+  })
+}
+
+/**
+ * 删除流程Activity Action定义
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
+ * @param actionId
+ */
+export function deleteWfActivityActionDefById(wfDefId: number, activityDefId: number, actionId: number) {
+  return apiRequest({
+    url: `/wf/activity/action/def/${wfDefId}/${activityDefId}/${actionId}`,
+    method: 'DELETE',
+  })
+}

+ 78 - 0
src/api/system/wfActivityDefApi.ts

@@ -0,0 +1,78 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询流程Activity定义
+ * @param data
+ * @returns
+ */
+export function getWfActivityDefByPage(data: any) {
+  return apiRequest({
+    url: '/wf/activity/def/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 列表查询WF Activity
+ * @returns
+ * @param wfDefId
+ */
+export function getWfActivityDefByList(wfDefId: number) {
+  return apiRequest({
+    url: `/wf/activity/def/${wfDefId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 基于ID查询Activity定义
+ * @returns
+ * @param wfDefId
+ * @param wfActivityDefId
+ */
+export function getWfActivityDefById(wfDefId: number, wfActivityDefId: number) {
+  return apiRequest({
+    url: `/wf/activity/def/${wfDefId}/${wfActivityDefId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加WF Activity定义
+ * @param data
+ * @returns
+ */
+export function createWfActivityDef(data: any) {
+  return apiRequest({
+    url: '/wf/activity/def/add',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 更新WF Activity定义
+ * @param data
+ * @returns
+ */
+export function updateWfActivityDef(data: any) {
+  return apiRequest({
+    url: '/wf/activity/def/update',
+    method: 'PUT',
+    data,
+  })
+}
+
+/**
+ * 删除WF Activity定义
+ * @returns
+ * @param wfDefId
+ * @param wfActivityDefId
+ */
+export function deleteWfActivityDefById(wfDefId: number, wfActivityDefId: number) {
+  return apiRequest({
+    url: `/wf/activity/def/${wfDefId}/${wfActivityDefId}`,
+    method: 'DELETE',
+  })
+}

+ 81 - 0
src/api/system/wfActivityInsApi.ts

@@ -0,0 +1,81 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询流程Activity实例
+ * @param data
+ * @returns
+ */
+export function getWfActivityInsByPage(data: any) {
+  return apiRequest({
+    url: '/wf/activity/ins/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 获取WF Activity实例列表
+ * @param data
+ * @returns
+ */
+export function getWfActivityInsByList(data: any) {
+  return apiRequest({
+    url: '/wf/activity/ins',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 获取WF Activity实例
+ * @returns
+ * @param ocId
+ * @param wfInsId
+ * @param activityInsId
+ */
+export function getWfActivityInsById(ocId: number, wfInsId: number, activityInsId: number) {
+  return apiRequest({
+    url: `/wf/activity/ins/${ocId}/${wfInsId}/${activityInsId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加WF Activity实例
+ * @param data
+ * @returns
+ */
+export function createWfActivityIns(data: any) {
+  return apiRequest({
+    url: '/wf/activity/ins/add',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 更新WF Activity实例
+ * @param data
+ * @returns
+ */
+export function updateWfActivityIns(data: any) {
+  return apiRequest({
+    url: '/wf/activity/ins/update',
+    method: 'PUT',
+    data,
+  })
+}
+
+/**
+ * 删除WF Activity实例
+ * @returns
+ * @param ocId
+ * @param wfInsId
+ * @param activityInsId
+ */
+export function deleteWfActivityInsById(ocId: number, wfInsId: number, activityInsId: number) {
+  return apiRequest({
+    url: `/wf/activity/ins/${ocId}/${wfInsId}/${activityInsId}`,
+    method: 'DELETE',
+  })
+}

+ 70 - 0
src/api/system/wfApi.ts

@@ -0,0 +1,70 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 启动Workflow
+ * @param wfDefId
+ * @returns
+ */
+export function startWorkflow(wfDefId: number) {
+  return apiRequest({
+    url: `/wf/start/${wfDefId}`,
+    method: 'GET',
+  })
+}
+
+export function getWorkflowById(wfInsId: number) {
+  return apiRequest({
+    url: `/wf/getIns/${wfInsId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 处理
+ * @param data
+ * @returns
+ */
+export function handleWorkflow(data: any) {
+  return apiRequest({
+    url: '/wf/handle',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 移交
+ * @param data
+ * @returns
+ */
+export function transferWorkflow(data: any) {
+  return apiRequest({
+    url: '/wf/transfer',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 完成
+ * @param wfInsId
+ * @returns
+ */
+export function completeWorkflow(wfInsId: number) {
+  return apiRequest({
+    url: `/wf/complete/${wfInsId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 撤消
+ * @param wfInsId
+ * @returns
+ */
+export function cancelWorkflow(wfInsId: number) {
+  return apiRequest({
+    url: `/wf/cancel/${wfInsId}`,
+    method: 'GET',
+  })
+}

+ 77 - 0
src/api/system/wfDefApi.ts

@@ -0,0 +1,77 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询流程定义
+ * @param data
+ * @returns
+ */
+export function getWfDefByPage(data: any) {
+  return apiRequest({
+    url: '/wf/def/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 列查查询流程定义
+ * @param data
+ * @returns
+ */
+export function getWfDefByList(data: any) {
+  return apiRequest({
+    url: '/wf/def',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 基于ID查询流程定义
+ * @returns
+ * @param wfDefId
+ */
+export function getWfDefById(wfDefId: number) {
+  return apiRequest({
+    url: `/wf/def/${wfDefId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加流程定义
+ * @param data
+ * @returns
+ */
+export function createWfDef(data: any) {
+  return apiRequest({
+    url: '/wf/def/add',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 更新流程定义
+ * @param data
+ * @returns
+ */
+export function updateWfDef(data: any) {
+  return apiRequest({
+    url: '/wf/def/update',
+    method: 'PUT',
+    data,
+  })
+}
+
+/**
+ * 删除流程定义
+ * @returns
+ * @param wfDefId
+ */
+export function deleteWfDef(wfDefId: number) {
+  return apiRequest({
+    url: `/wf/def/${wfDefId}`,
+    method: 'DELETE',
+  })
+}

+ 63 - 0
src/api/system/wfExampleApi.ts

@@ -0,0 +1,63 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询
+ * @param data
+ * @returns
+ */
+export function getWfExampleByPage(data: any) {
+  return apiRequest({
+    url: '/wf/example/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 列表查询
+ * @param data
+ * @returns
+ */
+export function getWfExampleByList(data: any) {
+  return apiRequest({
+    url: '/wf/example',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 基于ID查询Wf Example
+ * @returns
+ * @param exampleId
+ */
+export function getWfExampleById(exampleId: number) {
+  return apiRequest({
+    url: `/wf/example/${exampleId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加Wf Example
+ * @returns
+ */
+export function startWfExample() {
+  return apiRequest({
+    url: '/wf/example/start',
+    method: 'GET',
+  })
+}
+
+/**
+ * 更新Wf Example
+ * @param data
+ * @returns
+ */
+export function submitWfExample(data: any) {
+  return apiRequest({
+    url: '/wf/example/submit',
+    method: 'POST',
+    data,
+  })
+}

+ 78 - 0
src/api/system/wfInsApi.ts

@@ -0,0 +1,78 @@
+import apiRequest from '@/network/http/apiRequest'
+
+/**
+ * 分页查询流程实例
+ * @param data
+ * @returns
+ */
+export function getWfInsByPage(data: any) {
+  return apiRequest({
+    url: '/wf/ins/page',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 列表查询流程实例
+ * @param data
+ * @returns
+ */
+export function getWfInsByList(data: any) {
+  return apiRequest({
+    url: '/wf/ins',
+    method: 'GET',
+    params: data,
+  })
+}
+
+/**
+ * 基于ID查询流程实例
+ * @param wfInsId
+ * @returns
+ */
+export function getWfInsById(wfInsId: number) {
+  return apiRequest({
+    url: `/wf/ins/${wfInsId}`,
+    method: 'GET',
+  })
+}
+
+/**
+ * 添加流程实例
+ * @param data
+ * @returns
+ */
+export function createWfIns(data: any) {
+  return apiRequest({
+    url: '/wf/ins/add',
+    method: 'POST',
+    data,
+  })
+}
+
+/**
+ * 更新流程实例
+ * @param data
+ * @returns
+ */
+export function updateWfIns(data: any) {
+  return apiRequest({
+    url: '/wf/ins/update',
+    method: 'PUT',
+    data,
+  })
+}
+
+/**
+ * 删除流程实例
+ * @param ocId
+ * @param wfInsId
+ * @returns
+ */
+export function deleteWfInsById(ocId: number, wfInsId: number) {
+  return apiRequest({
+    url: `/wf/ins/${ocId}/${wfInsId}`,
+    method: 'DELETE',
+  })
+}

+ 1 - 1
src/network/http/apiRequest.ts

@@ -79,7 +79,7 @@ apiRequest.interceptors.response.use(
     }
   },
   (error) => {
-    loading.close()
+    // loading.close()
     let message = error.message
     if (message === 'Network Error') {
       message = '后端网络故障'

+ 45 - 16
src/views/personal/setting.vue

@@ -11,6 +11,24 @@ import { ElMessage } from 'element-plus'
 
 const router = useRouter()
 
+const state = reactive({
+  loading: false,
+  basicData: {
+    accountId: undefined,
+    accountName: '',
+    accountRealName: '',
+    accountAvatar: '',
+    accountPhone: '',
+    accountStaffNo: '',
+    accountIntro: '',
+  },
+  passData: {
+    accountId: undefined,
+    password: undefined,
+    rePassword: undefined,
+  },
+})
+
 const form = ref({
   headimg: '',
   mobile: '',
@@ -41,30 +59,41 @@ const editPassword = () => {
         <el-tab-pane label="基本设置" class="basic">
           <h2>基本设置</h2>
           <el-row :gutter="20">
+            <el-col :span="8">
+              <image-upload
+                v-model:url="form.headimg"
+                action="http://scrm.1daas.com/api/upload/upload"
+                name="image"
+                :data="{ token: 'TKD628431923530324' }"
+                notip
+                class="headimg-upload"
+                @on-success="handleSuccess"
+              />
+            </el-col>
+
             <el-col :span="16">
-              <el-form ref="formRef" :model="form" label-width="120px" label-suffix=":">
-                <el-form-item label="名 称">
-                  <el-input v-model="form.name" placeholder="请输入你的名称" />
+              <el-form ref="formRef" :model="state.basicData" label-width="120px" label-suffix=":">
+                <el-form-item label="帐号名称" prop="accountName">
+                  <el-input v-model="state.basicData.accountName" />
                 </el-form-item>
-                <el-form-item label="手机号">
-                  <el-input v-model="form.mobile" placeholder="请输入你的手机号" />
+
+                <el-form-item label="手机号码" prop="accountPhone">
+                  <el-input v-model="state.basicData.accountPhone" />
                 </el-form-item>
-                <el-form-item label="QQ 号">
-                  <el-input v-model="form.qq" placeholder="请输入你的 QQ 号" />
+
+                <el-form-item label="个人姓名" prop="accountRealName">
+                  <el-input v-model="state.basicData.accountRealName" />
                 </el-form-item>
-                <el-form-item label="微信号">
-                  <el-input v-model="form.wechat" placeholder="请输入你的微信号" />
+
+                <el-form-item label="工    号" prop="accountRealName">
+                  <el-input v-model="state.basicData.accountStaffNo" />
                 </el-form-item>
-                <el-form-item>
-                  <el-button type="primary">
-                    保存
-                  </el-button>
+
+                <el-form-item label="介    绍" prop="accountIntro">
+                  <el-input v-model="state.basicData.accountIntro" type="textarea" :rows="8" />
                 </el-form-item>
               </el-form>
             </el-col>
-            <el-col :span="8">
-              <image-upload v-model:url="form.headimg" action="http://scrm.1daas.com/api/upload/upload" name="image" :data="{ token: 'TKD628431923530324' }" notip class="headimg-upload" @on-success="handleSuccess" />
-            </el-col>
           </el-row>
         </el-tab-pane>
         <el-tab-pane label="安全设置" class="security">