Showing
2 changed files
with
43 additions
and
12 deletions
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-06-17 14:54:29 | 2 | * @Date: 2022-06-17 14:54:29 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2024-06-12 15:06:04 | 4 | + * @LastEditTime: 2024-07-04 17:05:30 |
| 5 | * @FilePath: /data-table/src/api/data.js | 5 | * @FilePath: /data-table/src/api/data.js |
| 6 | * @Description: 表单数据接口 | 6 | * @Description: 表单数据接口 |
| 7 | */ | 7 | */ |
| ... | @@ -11,6 +11,7 @@ const Api = { | ... | @@ -11,6 +11,7 @@ const Api = { |
| 11 | ADD_FORM_DATA: '/srv/?a=add_formdata', | 11 | ADD_FORM_DATA: '/srv/?a=add_formdata', |
| 12 | QUERY_FORM_DATA: '/srv/?a=query_formdata', | 12 | QUERY_FORM_DATA: '/srv/?a=query_formdata', |
| 13 | MODI_FORM_DATA: '/srv/?a=modi_formdata', | 13 | MODI_FORM_DATA: '/srv/?a=modi_formdata', |
| 14 | + FLOW_FORM_DATA: '/srv/?a=flow_formdata', | ||
| 14 | } | 15 | } |
| 15 | /** | 16 | /** |
| 16 | * @description: 添加表单数据 | 17 | * @description: 添加表单数据 |
| ... | @@ -33,3 +34,14 @@ export const queryFormDataAPI = (params) => fn(fetch.get(Api.QUERY_FORM_DATA, pa | ... | @@ -33,3 +34,14 @@ export const queryFormDataAPI = (params) => fn(fetch.get(Api.QUERY_FORM_DATA, pa |
| 33 | * @param: data 待添加的数据,json对象结构;键值对记录变更的字段和值; | 34 | * @param: data 待添加的数据,json对象结构;键值对记录变更的字段和值; |
| 34 | */ | 35 | */ |
| 35 | export const modiFormDataAPI = (params) => fn(fetch.post(Api.MODI_FORM_DATA, params)); | 36 | export const modiFormDataAPI = (params) => fn(fetch.post(Api.MODI_FORM_DATA, params)); |
| 37 | + | ||
| 38 | +/** | ||
| 39 | + * @description: 流程表单数据 | ||
| 40 | + * @param: form_code 表单唯一标识 | ||
| 41 | + * @param: data_id 数据ID | ||
| 42 | + * @param: data 待添加的数据,json对象结构;键值对记录变更的字段和值; | ||
| 43 | + * @param: flow_node_code 流程节点 | ||
| 44 | + * @param: flow_node_action_id 用户点击的流程节点按钮ID | ||
| 45 | + * @param: flow_content 流程审批的文本意见 | ||
| 46 | + */ | ||
| 47 | +export const flowFormDataAPI = (params) => fn(fetch.post(Api.FLOW_FORM_DATA, params)); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-07-18 10:22:22 | 2 | * @Date: 2022-07-18 10:22:22 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2024-07-04 15:18:15 | 4 | + * @LastEditTime: 2024-07-05 10:44:37 |
| 5 | * @FilePath: /data-table/src/views/index.vue | 5 | * @FilePath: /data-table/src/views/index.vue |
| 6 | * @Description: 首页 | 6 | * @Description: 首页 |
| 7 | --> | 7 | --> |
| ... | @@ -35,7 +35,7 @@ | ... | @@ -35,7 +35,7 @@ |
| 35 | </div> | 35 | </div> |
| 36 | <!-- 流程表单 --> | 36 | <!-- 流程表单 --> |
| 37 | <div v-if="formSetting.is_flow" style="margin: 16px; padding-top: 1rem;"> | 37 | <div v-if="formSetting.is_flow" style="margin: 16px; padding-top: 1rem;"> |
| 38 | - <div v-if="page_type === 'flow'"> | 38 | + <div v-if="page_type === 'flow' && formSetting.is_flow_content"> |
| 39 | <p style="margin-bottom: 1rem; font-size: 0.85rem; font-weight: bold;">审批意见</p> | 39 | <p style="margin-bottom: 1rem; font-size: 0.85rem; font-weight: bold;">审批意见</p> |
| 40 | <div style="margin-bottom: 1rem; border: 1px solid #eee;"> | 40 | <div style="margin-bottom: 1rem; border: 1px solid #eee;"> |
| 41 | <van-field | 41 | <van-field |
| ... | @@ -146,7 +146,7 @@ import { | ... | @@ -146,7 +146,7 @@ import { |
| 146 | } from "@/utils/generatePackage.js"; | 146 | } from "@/utils/generatePackage.js"; |
| 147 | import { useRoute } from "vue-router"; | 147 | import { useRoute } from "vue-router"; |
| 148 | import { queryFormAPI, postVerifyPasswordAPI } from "@/api/form.js"; | 148 | import { queryFormAPI, postVerifyPasswordAPI } from "@/api/form.js"; |
| 149 | -import { addFormDataAPI, queryFormDataAPI, modiFormDataAPI } from "@/api/data.js"; | 149 | +import { addFormDataAPI, queryFormDataAPI, modiFormDataAPI, flowFormDataAPI } from "@/api/data.js"; |
| 150 | import { showSuccessToast, showFailToast, showConfirmDialog } from "vant"; | 150 | import { showSuccessToast, showFailToast, showConfirmDialog } from "vant"; |
| 151 | import { wxInfo, getUrlParams } from "@/utils/tools"; | 151 | import { wxInfo, getUrlParams } from "@/utils/tools"; |
| 152 | import { styleColor } from "@/constant.js"; | 152 | import { styleColor } from "@/constant.js"; |
| ... | @@ -274,9 +274,8 @@ const onApprovalSelect = (item) => { | ... | @@ -274,9 +274,8 @@ const onApprovalSelect = (item) => { |
| 274 | if (page_type === 'add') { // 新增页面统一处理为提交 | 274 | if (page_type === 'add') { // 新增页面统一处理为提交 |
| 275 | myForm.value.submit(); | 275 | myForm.value.submit(); |
| 276 | } | 276 | } |
| 277 | - // TODO: 等待处理方式 | ||
| 278 | if (page_type === 'flow') { | 277 | if (page_type === 'flow') { |
| 279 | - console.warn('flow'); | 278 | + myForm.value.submit(); |
| 280 | } | 279 | } |
| 281 | // switch (item.id) { | 280 | // switch (item.id) { |
| 282 | // case 'commit': | 281 | // case 'commit': |
| ... | @@ -300,10 +299,10 @@ const onApprovalCancel = () => { | ... | @@ -300,10 +299,10 @@ const onApprovalCancel = () => { |
| 300 | console.warn('取消'); | 299 | console.warn('取消'); |
| 301 | } | 300 | } |
| 302 | 301 | ||
| 303 | -const handleApproval = (type) => { | 302 | +// const handleApproval = (type) => { |
| 304 | - console.warn(type); | 303 | +// console.warn(type); |
| 305 | - console.warn(approval_note.value); | 304 | +// console.warn(approval_note.value); |
| 306 | -} | 305 | +// } |
| 307 | 306 | ||
| 308 | // TODO: 等待调试发送短信接口 | 307 | // TODO: 等待调试发送短信接口 |
| 309 | const bind_tel_show = ref(false); | 308 | const bind_tel_show = ref(false); |
| ... | @@ -1032,8 +1031,28 @@ const onSubmit = async (values) => { | ... | @@ -1032,8 +1031,28 @@ const onSubmit = async (values) => { |
| 1032 | // 提交按钮禁用状态 | 1031 | // 提交按钮禁用状态 |
| 1033 | submitStatus.value = false; | 1032 | submitStatus.value = false; |
| 1034 | } | 1033 | } |
| 1035 | - } else if (page_type === 'flow') { // TODO: 流程表单提交,需要新的接口 | 1034 | + } else if (page_type === 'flow') { // 流程表单提交 |
| 1036 | - | 1035 | + const result = await flowFormDataAPI({ |
| 1036 | + form_code: $route.query.code, | ||
| 1037 | + data: postData.value, | ||
| 1038 | + data_id, | ||
| 1039 | + flow_node_code: formSetting.value.flow_node_code, | ||
| 1040 | + flow_node_action_id: flow_node_action_id.value, | ||
| 1041 | + flow_content: approval_note.value | ||
| 1042 | + }); | ||
| 1043 | + if (result.code) { | ||
| 1044 | + // 提交按钮禁用状态 | ||
| 1045 | + submitStatus.value = false; | ||
| 1046 | + // | ||
| 1047 | + showSuccessToast("操作成功"); | ||
| 1048 | + // 缓存表单返回值 | ||
| 1049 | + // store.changeSuccessInfo(result.data); | ||
| 1050 | + // 表单成功提交后续操作 | ||
| 1051 | + // successHandle(); | ||
| 1052 | + } else { | ||
| 1053 | + // 提交按钮禁用状态 | ||
| 1054 | + submitStatus.value = false; | ||
| 1055 | + } | ||
| 1037 | } else { | 1056 | } else { |
| 1038 | console.warn('缺参数'); | 1057 | console.warn('缺参数'); |
| 1039 | } | 1058 | } | ... | ... |
-
Please register or login to post a comment