Showing
2 changed files
with
14 additions
and
35 deletions
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-26 23:52:36 | 3 | * @Date: 2022-05-26 23:52:36 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2024-08-02 22:58:05 | 5 | + * @LastEditTime: 2024-08-12 11:12:35 |
| 6 | * @FilePath: /data-table/src/App.vue | 6 | * @FilePath: /data-table/src/App.vue |
| 7 | * @Description: | 7 | * @Description: |
| 8 | --> | 8 | --> |
| ... | @@ -82,8 +82,9 @@ onMounted(async () => { | ... | @@ -82,8 +82,9 @@ onMounted(async () => { |
| 82 | const page_type = getUrlParams(location.href) ? getUrlParams(location.href).page_type : ''; | 82 | const page_type = getUrlParams(location.href) ? getUrlParams(location.href).page_type : ''; |
| 83 | const raw_url = encodeURIComponent(location.pathname + location.hash); | 83 | const raw_url = encodeURIComponent(location.pathname + location.hash); |
| 84 | const flow_node_code = getUrlParams(location.href) ? getUrlParams(location.href).flow_node_code : ''; // flow_node_code 表示随机选择的流程节点的ID | 84 | const flow_node_code = getUrlParams(location.href) ? getUrlParams(location.href).flow_node_code : ''; // flow_node_code 表示随机选择的流程节点的ID |
| 85 | + const force_back = getUrlParams(location.href) ? getUrlParams(location.href).force_back : ''; // force_back=1 时,强制按照后台用户模式检查权限 | ||
| 85 | // 数据收集设置 | 86 | // 数据收集设置 |
| 86 | - const { data } = await getFormSettingAPI({ form_code: code, page_type, data_id, flow_node_code }); | 87 | + const { data } = await getFormSettingAPI({ form_code: code, page_type, data_id, flow_node_code, force_back }); |
| 87 | const form_setting = {}; | 88 | const form_setting = {}; |
| 88 | if (data.length) { | 89 | if (data.length) { |
| 89 | Object.assign(form_setting, data[0]['property_list'], data[0]['extend']); | 90 | Object.assign(form_setting, data[0]['property_list'], data[0]['extend']); | ... | ... |
| 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-08-09 19:22:14 | 4 | + * @LastEditTime: 2024-08-12 11:15:45 |
| 5 | * @FilePath: /data-table/src/views/index.vue | 5 | * @FilePath: /data-table/src/views/index.vue |
| 6 | * @Description: 首页 | 6 | * @Description: 首页 |
| 7 | --> | 7 | --> |
| ... | @@ -193,16 +193,7 @@ | ... | @@ -193,16 +193,7 @@ |
| 193 | <script setup> | 193 | <script setup> |
| 194 | import "@vant/touch-emulator"; | 194 | import "@vant/touch-emulator"; |
| 195 | import { createComponentType } from "@/hooks/useComponentType"; | 195 | import { createComponentType } from "@/hooks/useComponentType"; |
| 196 | -import { | 196 | +import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle, } from "@/utils/generatePackage.js"; |
| 197 | - Cookies, | ||
| 198 | - $, | ||
| 199 | - _, | ||
| 200 | - axios, | ||
| 201 | - storeToRefs, | ||
| 202 | - mainStore, | ||
| 203 | - Toast, | ||
| 204 | - useTitle, | ||
| 205 | -} from "@/utils/generatePackage.js"; | ||
| 206 | import { useRoute } from "vue-router"; | 197 | import { useRoute } from "vue-router"; |
| 207 | import { queryFormAPI, postVerifyPasswordAPI } from "@/api/form.js"; | 198 | import { queryFormAPI, postVerifyPasswordAPI } from "@/api/form.js"; |
| 208 | import { addFormDataAPI, queryFormDataAPI, modiFormDataAPI, flowFormDataAPI } from "@/api/data.js"; | 199 | import { addFormDataAPI, queryFormDataAPI, modiFormDataAPI, flowFormDataAPI } from "@/api/data.js"; |
| ... | @@ -261,7 +252,8 @@ const x_field_1 = $route.query.x_field_1 ? $route.query.x_field_1 : null; | ... | @@ -261,7 +252,8 @@ const x_field_1 = $route.query.x_field_1 ? $route.query.x_field_1 : null; |
| 261 | const x_cycle = $route.query.x_cycle ? $route.query.x_cycle : null; | 252 | const x_cycle = $route.query.x_cycle ? $route.query.x_cycle : null; |
| 262 | // iframe传值openid | 253 | // iframe传值openid |
| 263 | const iframe_openid = getUrlParams(location.href) ? getUrlParams(location.href).openid : ''; | 254 | const iframe_openid = getUrlParams(location.href) ? getUrlParams(location.href).openid : ''; |
| 264 | - | 255 | +// 强制后台检查标识 |
| 256 | +const force_back = $route.query.force_back ? $route.query.force_back : ''; | ||
| 265 | // 格式化表单数据结构 | 257 | // 格式化表单数据结构 |
| 266 | const formatData = (data) => { | 258 | const formatData = (data) => { |
| 267 | const arr = []; | 259 | const arr = []; |
| ... | @@ -347,23 +339,6 @@ const onApprovalSelect = (item) => { | ... | @@ -347,23 +339,6 @@ const onApprovalSelect = (item) => { |
| 347 | } | 339 | } |
| 348 | myForm.value.submit(); | 340 | myForm.value.submit(); |
| 349 | } | 341 | } |
| 350 | - // switch (item.id) { | ||
| 351 | - // case 'commit': | ||
| 352 | - // myForm.value.submit(); | ||
| 353 | - // break; | ||
| 354 | - // case 'draft': | ||
| 355 | - // myForm.value.submit(); | ||
| 356 | - // break; | ||
| 357 | - // case 'withdraw': | ||
| 358 | - // handleApproval('withdraw'); | ||
| 359 | - // break; | ||
| 360 | - // case 'reject': | ||
| 361 | - // handleApproval('reject'); | ||
| 362 | - // break; | ||
| 363 | - // case 'terminate': | ||
| 364 | - // handleApproval('terminate'); | ||
| 365 | - // break; | ||
| 366 | - // } | ||
| 367 | }; | 342 | }; |
| 368 | const onApprovalCancel = () => { | 343 | const onApprovalCancel = () => { |
| 369 | console.warn('取消'); | 344 | console.warn('取消'); |
| ... | @@ -426,7 +401,7 @@ onMounted(async () => { | ... | @@ -426,7 +401,7 @@ onMounted(async () => { |
| 426 | document | 401 | document |
| 427 | .querySelector("body") | 402 | .querySelector("body") |
| 428 | .setAttribute("style", `background-color: ${styleColor.backgroundColor}`); | 403 | .setAttribute("style", `background-color: ${styleColor.backgroundColor}`); |
| 429 | - const { data, flow_process_list, code } = await queryFormAPI({ form_code: $route.query.code, page_type, data_id, flow_node_code }); // flow_node_code 表示随机选择的流程节点的ID | 404 | + const { data, flow_process_list, code } = await queryFormAPI({ form_code: $route.query.code, page_type, data_id, flow_node_code, force_back }); // flow_node_code 表示随机选择的流程节点的ID |
| 430 | const form_data = data; | 405 | const form_data = data; |
| 431 | // 处理审批意见显示 | 406 | // 处理审批意见显示 |
| 432 | if (code) { | 407 | if (code) { |
| ... | @@ -652,7 +627,7 @@ onMounted(async () => { | ... | @@ -652,7 +627,7 @@ onMounted(async () => { |
| 652 | 627 | ||
| 653 | // TAG:获取原来表单数据 | 628 | // TAG:获取原来表单数据 |
| 654 | if (data_id) { // 如果有data_id,则获取历史数据 否则获取表单默认值 | 629 | if (data_id) { // 如果有data_id,则获取历史数据 否则获取表单默认值 |
| 655 | - const history_data = await queryFormDataAPI({ form_code: $route.query.code, data_id, openid: iframe_openid }); | 630 | + const history_data = await queryFormDataAPI({ form_code: $route.query.code, data_id, openid: iframe_openid, force_back }); |
| 656 | if (history_data.code) { | 631 | if (history_data.code) { |
| 657 | // let object = history_data.data; // 表单数据 | 632 | // let object = history_data.data; // 表单数据 |
| 658 | // formData.value.forEach((item) => { // 把对应数据赋值到表单 | 633 | // formData.value.forEach((item) => { // 把对应数据赋值到表单 |
| ... | @@ -671,7 +646,7 @@ onMounted(async () => { | ... | @@ -671,7 +646,7 @@ onMounted(async () => { |
| 671 | // 结构优化一下 | 646 | // 结构优化一下 |
| 672 | let object = history_data.data; | 647 | let object = history_data.data; |
| 673 | const isInfoPage = page_type === 'info'; | 648 | const isInfoPage = page_type === 'info'; |
| 674 | - const objectMap = new Map(Object.entries(object)); // 将 object 转换为 Map | 649 | + const objectMap = new Map(Object.entries(object)); // 将 object 转换为 Map,Object.entries() 方法用于返回一个给定对象自身可枚举属性的键值对数组,数组中的每个元素是一个包含键值对的数组,[ ["name", "Alice"], ["age", 30], ["city", "New York"] ] |
| 675 | formData.value.forEach((item) => { | 650 | formData.value.forEach((item) => { |
| 676 | if (objectMap.has(item.key)) { | 651 | if (objectMap.has(item.key)) { |
| 677 | item.component_props.default = objectMap.get(item.key); | 652 | item.component_props.default = objectMap.get(item.key); |
| ... | @@ -1183,6 +1158,7 @@ const onSubmit = async (values) => { | ... | @@ -1183,6 +1158,7 @@ const onSubmit = async (values) => { |
| 1183 | openid: iframe_openid, | 1158 | openid: iframe_openid, |
| 1184 | flow_id: formSetting.value.flow_id, // 流程相关保存接口, 把flow_id传到后台 | 1159 | flow_id: formSetting.value.flow_id, // 流程相关保存接口, 把flow_id传到后台 |
| 1185 | flow_node_action_id: 'commit', // 流程节点的操作按钮的ID, 因为只有提交操作,ID写死 | 1160 | flow_node_action_id: 'commit', // 流程节点的操作按钮的ID, 因为只有提交操作,ID写死 |
| 1161 | + force_back | ||
| 1186 | }); | 1162 | }); |
| 1187 | if (result.code) { | 1163 | if (result.code) { |
| 1188 | // 提交按钮禁用状态 | 1164 | // 提交按钮禁用状态 |
| ... | @@ -1227,7 +1203,8 @@ const onSubmit = async (values) => { | ... | @@ -1227,7 +1203,8 @@ const onSubmit = async (values) => { |
| 1227 | form_code: $route.query.code, | 1203 | form_code: $route.query.code, |
| 1228 | data: postData.value, | 1204 | data: postData.value, |
| 1229 | openid: iframe_openid, | 1205 | openid: iframe_openid, |
| 1230 | - data_id | 1206 | + data_id, |
| 1207 | + force_back | ||
| 1231 | }); | 1208 | }); |
| 1232 | if (result.code) { | 1209 | if (result.code) { |
| 1233 | // 提交按钮禁用状态 | 1210 | // 提交按钮禁用状态 |
| ... | @@ -1257,6 +1234,7 @@ const onSubmit = async (values) => { | ... | @@ -1257,6 +1234,7 @@ const onSubmit = async (values) => { |
| 1257 | flow_node_action_id: flow_node_action_id.value, | 1234 | flow_node_action_id: flow_node_action_id.value, |
| 1258 | flow_content: approval_note.value, | 1235 | flow_content: approval_note.value, |
| 1259 | flow_reject_to_node_codes: checked_reject.value.length ? checked_reject.value.join(',') : '', | 1236 | flow_reject_to_node_codes: checked_reject.value.length ? checked_reject.value.join(',') : '', |
| 1237 | + force_back | ||
| 1260 | }); | 1238 | }); |
| 1261 | if (result.code) { | 1239 | if (result.code) { |
| 1262 | // 提交按钮禁用状态 | 1240 | // 提交按钮禁用状态 | ... | ... |
-
Please register or login to post a comment