admin/mobile-workflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-25 22:34:09 +08:00
parent 15b14c616c
commit 3f5c26fb4d
5 changed files with 152 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/request.js
View File

@ -13,8 +13,8 @@
//export const BASE_URL = "http://106.13.16.28:10000"
// 生产环境
export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境
// export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境
// export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境
export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境
//是否已显示未登录弹窗
let showNoLoginTip = false

2
api/task.js
View File

@ -41,7 +41,7 @@ export function getCcMeList(params) {
return request({
url: `wflow/process/ccMe`,
method: 'get',
params: params
data: params
})
}

13
components/form/ProcessIndex.vue
View File

@ -13,7 +13,7 @@
</template>
<script setup>
import { computed, nextTick, watch } from 'vue'
import { computed, nextTick, watch, ref } from 'vue'
import Avatar from '@/components/Avatar.vue'
import { getRes } from '@/utils/tool.js'
import { onUnload } from "@dcloudio/uni-app";
@ -36,12 +36,15 @@
const _value = computed({
get() {
console.log(JSON.stringify(props.formProps),66)
console.log(props.modelValue,77)
return props.modelValue
},
set(val) {
emits('update:modelValue', val)
}
})
const processCode = ref();
const emits = defineEmits(['update:modelValue'])
@ -53,7 +56,7 @@
function selectProcess() {
uni.navigateTo({
url: '/components/form/sub/ProcessSelect'
url: '/components/form/sub/ProcessSelect?processCode='+processCode.value
})
}
@ -77,6 +80,12 @@
watch(_value, (newValue) => {
emits('update:modelValue', newValue)
})
watch(props.formProps, (newValue) => {
processCode.value = newValue.processCode;
},{
immediate: true,
deep: true
})
</script>
<style lang="less" scoped>

1
components/form/sub/ProcessSelect.vue
View File

@ -151,6 +151,7 @@
}
onLoad((v) => {
params.value.code = v.processCode;
getDataList()
})

257
unpackage/dist/dev/app-plus/app-service.js vendored
View File

@ -54,7 +54,7 @@ if (uni.restoreGlobal) {
const onUnload = /* @__PURE__ */ createHook(ON_UNLOAD);
const onBackPress = /* @__PURE__ */ createHook(ON_BACK_PRESS);
const onPullDownRefresh = /* @__PURE__ */ createHook(ON_PULL_DOWN_REFRESH);
const BASE_URL = "http://192.168.34.221:9111";
const BASE_URL = "http://42.180.188.17:19098";
function request(config = {}, sl = true) {
return new Promise((resolve, reject) => {
if (sl) {
@ -81,7 +81,7 @@ if (uni.restoreGlobal) {
} else if (res.statusCode === 401)
;
else if (res.statusCode === 500) {
formatAppLog("log", "at api/request.js:61", res);
formatAppLog("log", "at api/request.js:66", res);
uni.showToast({
icon: "none",
title: "系统异常：" + res.data
@ -94,7 +94,7 @@ if (uni.restoreGlobal) {
}
},
fail: (err) => {
formatAppLog("log", "at api/request.js:75", err);
formatAppLog("log", "at api/request.js:80", err);
uni.showToast({
title: "网络异常，请检查网络",
duration: 2e3,
@ -3270,6 +3270,101 @@ if (uni.restoreGlobal) {
)) : vue.createCommentVNode("v-if", true);
}
const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$m], ["__scopeId", "data-v-4dd3c44b"], ["__file", "E:/jxjadminMobile/mobile-workflow/uni_modules/uni-popup/components/uni-popup/uni-popup.vue"]]);
function getRes(url) {
if (url) {
const reg = /^(http:|https:).*/gi;
return reg.test(url) ? url : BASE_URL + "/image/" + url;
} else {
return url;
}
}
function debounce(call, cycle = 800) {
var timer = null;
let func = call;
return function(...args) {
clearTimeout(timer);
timer = setTimeout(() => {
func.apply(this, args);
}, cycle);
};
}
function $deepCopy(obj) {
return JSON.parse(JSON.stringify(obj));
}
function $nEmpty(obj) {
return obj && (obj || "") !== "";
}
function parseNumber(val, precision) {
if (typeof val === "string") {
return precision > 0 ? parseFloat(parseFloat(val).toFixed(precision)) : parseInt(val);
}
return val;
}
const fileTypes = {
pdf: ["pdf"],
img: ["bmp", "jpg", "png", "tif", "gif", "svg", "psd", "webp", "apng"],
video: ["mp4", "avi", "mpeg", "mkv", "mov", "rmvb", "flv", "3gp", "wav"],
word: ["doc", "docx"],
excel: ["xls", "xlsx"],
ppt: ["ppt", "pptx"],
txt: ["txt"],
zip: ["zip", "rar", "7z", "iso"]
};
const fileTypeMap = /* @__PURE__ */ new Map();
for (const key of Object.keys(fileTypes)) {
fileTypes[key].forEach((v2) => fileTypeMap.set(v2, key));
}
function getFileImgByType(fileName) {
const type = fileTypeMap.get(fileName.split(".").pop());
return `/static/image/filetype/${(type || "") === "" ? "file" : type}.png`;
}
function saveFileTemp(file) {
let fileObj = uni.getStorageSync("localFile");
if (!fileObj) {
fileObj = {};
}
fileObj[file.name] = file;
uni.setStorageSync("localFile", fileObj);
}
function removeFileTemp(name2) {
let fileObj = uni.getStorageSync("localFile");
delete fileObj[name2];
uni.setStorageSync("localFile", fileObj);
}
function getFormValText(obj) {
switch (obj.type) {
case "DeptPicker":
case "GroupPicker":
case "UserPicker":
case "FileUpload":
case "ImageUpload":
return (obj.value || []).map((v2) => v2.name).join("、");
case "TimeRangePicker":
case "DateTimeRange":
case "SelectPlus":
case "MultipleSelect":
return (obj.value || []).join("、");
case "ProcessIndex":
return (obj.value || []).map((v2) => v2.startUser.name + "-" + v2.name).join("、");
default:
return obj.value;
}
}
function showItem(item, val) {
return !(item.perm === "R" && isEm(val)) || item.perm === "H";
}
function isEm(val) {
return !$nEmpty(val) || val instanceof String && val.trim() === "" || Array.isArray(val) && val.length === 0;
}
function isVideoLink(url) {
const videoExtensions = ["mp4", "webm", "ogg", "mov", "avi", "flv", "wmv"];
const extension = url.split(".").pop().toLowerCase();
return videoExtensions.includes(extension);
}
function isImageLink(url) {
const imageExtensionsRegex = /\.(jpg|jpeg|png|gif|webp)$/i;
return imageExtensionsRegex.test(url);
}
const _sfc_main$12 = {
__name: "Avatar",
props: {
@ -3536,7 +3631,7 @@ if (uni.restoreGlobal) {
}
}
function toInnerOrg(org) {
formatAppLog("log", "at components/OrgPicker.vue:244", org);
formatAppLog("log", "at components/OrgPicker.vue:245", org);
if (org.type === "dept") {
currentDeptId.value = org.id;
orgPaths.value.push({
@ -3566,7 +3661,7 @@ if (uni.restoreGlobal) {
}
function searchUser() {
searchUsers.value.length = 0;
formatAppLog("log", "at components/OrgPicker.vue:277", props2.type, "type");
formatAppLog("log", "at components/OrgPicker.vue:278", props2.type, "type");
let request2 = null;
let name2 = "";
switch (props2.type) {
@ -3616,7 +3711,7 @@ if (uni.restoreGlobal) {
}
}
function selectChange(org) {
formatAppLog("log", "at components/OrgPicker.vue:339", org, "org");
formatAppLog("log", "at components/OrgPicker.vue:340", org, "org");
if (org.type === "dept" && props2.type === "user") {
toInnerOrg(org);
return;
@ -3633,7 +3728,7 @@ if (uni.restoreGlobal) {
selectedMap.value.clear();
}
selectedMap.value.set(orgId, org);
formatAppLog("log", "at components/OrgPicker.vue:361", selectedMap.value, "selectedMap.value", props2);
formatAppLog("log", "at components/OrgPicker.vue:362", selectedMap.value, "selectedMap.value", props2);
}
}
function loadSelected(orgs) {
@ -3794,7 +3889,7 @@ if (uni.restoreGlobal) {
org.type === "user" ? (vue.openBlock(), vue.createBlock(Avatar, {
key: 0,
name: org.name,
src: _ctx.getRes(org.avatar),
src: vue.unref(getRes)(org.avatar),
showName: false
}, null, 8, ["name", "src"])) : (vue.openBlock(), vue.createElementBlock("image", {
key: 1,
@ -3956,7 +4051,7 @@ if (uni.restoreGlobal) {
key: 0,
type: org.type,
closeable: org.enableEdit,
src: _ctx.getRes(org.avatar),
src: vue.unref(getRes)(org.avatar),
size: 25,
name: org.name,
showName: false
@ -4568,97 +4663,6 @@ if (uni.restoreGlobal) {
forEachNode(node.children, callback);
}
}
function getRes$1(url) {
const reg = /^(http:|https:).*/gi;
return reg.test(url) ? url : BASE_URL + "/image/" + url;
}
function debounce(call, cycle = 800) {
var timer = null;
let func = call;
return function(...args) {
clearTimeout(timer);
timer = setTimeout(() => {
func.apply(this, args);
}, cycle);
};
}
function $deepCopy(obj) {
return JSON.parse(JSON.stringify(obj));
}
function $nEmpty(obj) {
return obj && (obj || "") !== "";
}
function parseNumber(val, precision) {
if (typeof val === "string") {
return precision > 0 ? parseFloat(parseFloat(val).toFixed(precision)) : parseInt(val);
}
return val;
}
const fileTypes = {
pdf: ["pdf"],
img: ["bmp", "jpg", "png", "tif", "gif", "svg", "psd", "webp", "apng"],
video: ["mp4", "avi", "mpeg", "mkv", "mov", "rmvb", "flv", "3gp", "wav"],
word: ["doc", "docx"],
excel: ["xls", "xlsx"],
ppt: ["ppt", "pptx"],
txt: ["txt"],
zip: ["zip", "rar", "7z", "iso"]
};
const fileTypeMap = /* @__PURE__ */ new Map();
for (const key of Object.keys(fileTypes)) {
fileTypes[key].forEach((v2) => fileTypeMap.set(v2, key));
}
function getFileImgByType(fileName) {
const type = fileTypeMap.get(fileName.split(".").pop());
return `/static/image/filetype/${(type || "") === "" ? "file" : type}.png`;
}
function saveFileTemp(file) {
let fileObj = uni.getStorageSync("localFile");
if (!fileObj) {
fileObj = {};
}
fileObj[file.name] = file;
uni.setStorageSync("localFile", fileObj);
}
function removeFileTemp(name2) {
let fileObj = uni.getStorageSync("localFile");
delete fileObj[name2];
uni.setStorageSync("localFile", fileObj);
}
function getFormValText(obj) {
switch (obj.type) {
case "DeptPicker":
case "GroupPicker":
case "UserPicker":
case "FileUpload":
case "ImageUpload":
return (obj.value || []).map((v2) => v2.name).join("、");
case "TimeRangePicker":
case "DateTimeRange":
case "SelectPlus":
case "MultipleSelect":
return (obj.value || []).join("、");
case "ProcessIndex":
return (obj.value || []).map((v2) => v2.startUser.name + "-" + v2.name).join("、");
default:
return obj.value;
}
}
function showItem(item, val) {
return !(item.perm === "R" && isEm(val)) || item.perm === "H";
}
function isEm(val) {
return !$nEmpty(val) || val instanceof String && val.trim() === "" || Array.isArray(val) && val.length === 0;
}
function isVideoLink(url) {
const videoExtensions = ["mp4", "webm", "ogg", "mov", "avi", "flv", "wmv"];
const extension = url.split(".").pop().toLowerCase();
return videoExtensions.includes(extension);
}
function isImageLink(url) {
const imageExtensionsRegex = /\.(jpg|jpeg|png|gif|webp)$/i;
return imageExtensionsRegex.test(url);
}
const _sfc_main$Z = {
__name: "ProcessSelect",
setup(__props) {
@ -4726,6 +4730,8 @@ if (uni.restoreGlobal) {
setTimeout(() => uni.navigateBack(), 100);
}
function getDataRequest() {
formatAppLog("log", "at components/form/sub/ProcessSelect.vue:120", JSON.stringify(params.value), 987654321);
formatAppLog("log", "at components/form/sub/ProcessSelect.vue:121", current.value, 987654321);
switch (current.value) {
case 0:
return taskApi.getUserTodoList(params.value);
@ -4757,6 +4763,8 @@ if (uni.restoreGlobal) {
});
}
onLoad((v2) => {
formatAppLog("log", "at components/form/sub/ProcessSelect.vue:156", JSON.stringify(v2), 123456789);
params.value.code = v2.processCode;
getDataList();
});
onPullDownRefresh(() => {
@ -4853,7 +4861,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode("view", { class: "process-item-footer" }, [
vue.createVNode(Avatar, {
name: (item.owner || item.staterUser).name,
src: vue.unref(getRes$1)((item.owner || item.staterUser).avatar),
src: vue.unref(getRes)((item.owner || item.staterUser).avatar),
size: 30
}, null, 8, ["name", "src"]),
vue.createElementVNode(
@ -5191,7 +5199,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode("view", { class: "process-item-footer" }, [
vue.createVNode(Avatar, {
name: (item.owner || item.staterUser).name,
src: vue.unref(getRes$1)((item.owner || item.staterUser).avatar),
src: vue.unref(getRes)((item.owner || item.staterUser).avatar),
size: 30
}, null, 8, ["name", "src"]),
vue.createElementVNode(
@ -6102,7 +6110,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode("view", { class: "w-user-card" }, [
vue.createVNode(Avatar, {
class: "w-avatar",
src: _ctx.getRes(userDetail.value.avatar),
src: vue.unref(getRes)(userDetail.value.avatar),
name: userDetail.value.username,
size: 55,
showName: false
@ -6347,7 +6355,7 @@ if (uni.restoreGlobal) {
org.type === "user" ? (vue.openBlock(), vue.createBlock(Avatar, {
key: 0,
name: org.name,
src: _ctx.getRes(org.avatar),
src: vue.unref(getRes)(org.avatar),
showName: false
}, null, 8, ["name", "src"])) : (vue.openBlock(), vue.createElementBlock("image", {
key: 1,
@ -6468,7 +6476,7 @@ if (uni.restoreGlobal) {
vue.createElementVNode("view", { class: "w-user-info" }, [
vue.createVNode(Avatar, {
name: userDetail.value.username,
src: _ctx.getRes(userDetail.value.avatar),
src: vue.unref(getRes)(userDetail.value.avatar),
size: 70,
showName: false
}, null, 8, ["name", "src"]),
@ -17540,7 +17548,7 @@ ${i3}
}, [
vue.createVNode(Avatar, {
name: user.name,
src: _ctx.getRes(user.avatar),
src: vue.unref(getRes)(user.avatar),
size: 25,
showName: false
}, null, 8, ["name", "src"]),
@ -17580,7 +17588,7 @@ ${i3}
}, [
vue.createVNode(Avatar, {
name: user.name,
src: _ctx.getRes(user.avatar),
src: vue.unref(getRes)(user.avatar),
size: 25,
showName: false
}, null, 8, ["name", "src"]),
@ -31570,12 +31578,15 @@ ${i3}
const props2 = __props;
const _value = vue.computed({
get() {
formatAppLog("log", "at components/form/ProcessIndex.vue:39", JSON.stringify(props2.formProps), 66);
formatAppLog("log", "at components/form/ProcessIndex.vue:40", props2.modelValue, 77);
return props2.modelValue;
},
set(val) {
emits2("update:modelValue", val);
}
});
const processCode = vue.ref();
const emits2 = __emit;
function showInstance(prc) {
uni.navigateTo({
@ -31584,7 +31595,7 @@ ${i3}
}
function selectProcess() {
uni.navigateTo({
url: "/components/form/sub/ProcessSelect"
url: "/components/form/sub/ProcessSelect?processCode=" + processCode.value
});
}
uni.$on("selectProcess", (val) => {
@ -31604,6 +31615,12 @@ ${i3}
vue.watch(_value, (newValue) => {
emits2("update:modelValue", newValue);
});
vue.watch(props2.formProps, (newValue) => {
processCode.value = newValue.processCode;
}, {
immediate: true,
deep: true
});
return (_ctx, _cache) => {
const _component_uni_icons = resolveEasycom(vue.resolveDynamicComponent("uni-icons"), __easycom_3$2);
return vue.openBlock(), vue.createElementBlock("view", null, [
@ -31618,7 +31635,7 @@ ${i3}
}, [
vue.createVNode(Avatar, {
size: 30,
src: _ctx.getRes(prc.startUser.avatar),
src: vue.unref(getRes)(prc.startUser.avatar),
name: prc.startUser.name
}, null, 8, ["src", "name"]),
vue.createElementVNode(
@ -32635,14 +32652,14 @@ ${i3}
function filterImages(attachments) {
return (attachments || []).filter((f2) => f2.isImage).map((f2) => {
formatAppLog("log", "at pages/instance/processProgress.vue:109", f2.url);
return getRes$1(f2.url);
return getRes(f2.url);
});
}
function filterFiles(attachments) {
return (attachments || []).filter((f2) => !f2.isImage).map((f2) => {
return {
...f2,
url: getRes$1(f2.url)
url: getRes(f2.url)
};
});
}
@ -32723,7 +32740,7 @@ ${i3}
size: 42,
status: getStatus(node),
name: node.user.name,
src: vue.unref(getRes$1)(node.user.avatar),
src: vue.unref(getRes)(node.user.avatar),
showName: false
}, null, 8, ["status", "name", "src"])
]),
@ -33257,7 +33274,7 @@ ${i3}
}, [
vue.createVNode(Avatar, {
name: instanceData.value.staterUser.name,
src: _ctx.getRes(instanceData.value.staterUser.avatar),
src: vue.unref(getRes)(instanceData.value.staterUser.avatar),
showY: ""
}, null, 8, ["name", "src"]),
vue.createElementVNode("view", null, [
@ -33565,7 +33582,7 @@ ${i3}
emits2("addOrg", task);
}
function delOrg(i2, task) {
formatAppLog("log", "at pages/submit/ProcessNodeRender2.vue:69", "删除用户");
formatAppLog("log", "at pages/submit/ProcessNodeRender2.vue:70", "删除用户");
emits2("delOrg", i2, task);
}
return (_ctx, _cache) => {
@ -33633,7 +33650,7 @@ ${i3}
closeable: __props.task.enableEdit,
type: user.type,
key: user.id,
src: _ctx.getRes(user.avatar),
src: vue.unref(getRes)(user.avatar),
size: 30,
showY: "",
onClose: ($event) => delOrg(i2, __props.task)
@ -33779,7 +33796,7 @@ ${i3}
closeable: __props.task.enableEdit,
type: user.type,
key: user.id,
src: vue.unref(getRes$1)(user.avatar),
src: vue.unref(getRes)(user.avatar),
size: 30,
showY: "",
onClose: ($event) => delOrg(i2, __props.task)
@ -33991,7 +34008,7 @@ ${i3}
vue.onBeforeMount(() => loadProcessRender());
const processRenderDebounce = debounce(() => loadProcessRender(), 500);
async function loadProcessRender() {
formatAppLog("log", "at pages/submit/ProcessRender.vue:112", "渲染流程");
formatAppLog("log", "at pages/submit/ProcessRender.vue:113", "渲染流程");
data.loading = true;
data.processTasks.length = 0;
data.selectUserNodes.clear();
@ -34370,7 +34387,7 @@ ${i3}
}
}
function addOrg(node) {
formatAppLog("log", "at pages/submit/ProcessRender.vue:494", node, "node");
formatAppLog("log", "at pages/submit/ProcessRender.vue:495", node, "node");
data.selectedNode = node;
orgPicker.value.show();
}
@ -34382,7 +34399,7 @@ ${i3}
}
function validate(call) {
let isOk = true;
formatAppLog("log", "at pages/submit/ProcessRender.vue:511", isOk, "我的OK");
formatAppLog("log", "at pages/submit/ProcessRender.vue:512", isOk, "我的OK");
for (let nodeId of data.selectUserNodes) {
if ((_value.value[nodeId] || []).length === 0) {
isOk = false;
@ -34399,7 +34416,7 @@ ${i3}
break;
}
}
formatAppLog("log", "at pages/submit/ProcessRender.vue:531", isOk, "我的OK");
formatAppLog("log", "at pages/submit/ProcessRender.vue:532", isOk, "我的OK");
if (call) {
call(isOk);
}