From 02eea62af0a07d4addc90af045cd3ac216864ed0 Mon Sep 17 00:00:00 2001
From: lagos <627844378@qq.com>
Date: Mon, 26 May 2025 15:00:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.hbuilderx/launch.json | 9 +
env/.env.development | 4 +-
src/components/Mupload/Mupload.vue | 46 +++
.../SelectUser/components/SelectUserModal.vue | 2 +-
src/pages-bpm/leaveApplication/index.vue | 223 +++++++++++++++
src/pages-process/components/DynamicLink.vue | 101 +++----
src/pages-process/components/taskDeal.vue | 266 ++++++++++++++++++
src/pages-process/taskHandle.vue | 4 +-
src/pages-process/test.vue | 18 --
src/pages.json | 9 +-
src/static/add.png | Bin 0 -> 1166 bytes
src/static/user27.png | Bin 0 -> 1102 bytes
src/types/uni-pages.d.ts | 2 +-
vite.config.ts | 1 +
14 files changed, 610 insertions(+), 75 deletions(-)
create mode 100644 .hbuilderx/launch.json
create mode 100644 src/components/Mupload/Mupload.vue
create mode 100644 src/pages-bpm/leaveApplication/index.vue
create mode 100644 src/pages-process/components/taskDeal.vue
delete mode 100644 src/pages-process/test.vue
create mode 100644 src/static/add.png
create mode 100644 src/static/user27.png
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..8ae452a
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,9 @@
+{
+ "version" : "1.0",
+ "configurations" : [
+ {
+ "playground" : "standard",
+ "type" : "uni-app:app-android"
+ }
+ ]
+}
diff --git a/env/.env.development b/env/.env.development
index 4451dc4..096ebec 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,5 +4,5 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = false
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true
-#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
\ No newline at end of file
+VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
\ No newline at end of file
diff --git a/src/components/Mupload/Mupload.vue b/src/components/Mupload/Mupload.vue
new file mode 100644
index 0000000..874b4db
--- /dev/null
+++ b/src/components/Mupload/Mupload.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/SelectUser/components/SelectUserModal.vue b/src/components/SelectUser/components/SelectUserModal.vue
index 30346a0..20c5294 100644
--- a/src/components/SelectUser/components/SelectUserModal.vue
+++ b/src/components/SelectUser/components/SelectUserModal.vue
@@ -125,7 +125,7 @@ const props = defineProps({
default: '',
},
})
-const emit = defineEmits(['change', 'close'])
+const emit = defineEmits(['change', 'close','realNameChange'])
const toast = useToast()
const show = ref(true)
const api = {
diff --git a/src/pages-bpm/leaveApplication/index.vue b/src/pages-bpm/leaveApplication/index.vue
new file mode 100644
index 0000000..28debb5
--- /dev/null
+++ b/src/pages-bpm/leaveApplication/index.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
index 1287869..1325e81 100644
--- a/src/pages-process/components/DynamicLink.vue
+++ b/src/pages-process/components/DynamicLink.vue
@@ -1,66 +1,69 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/src/pages-process/components/taskDeal.vue b/src/pages-process/components/taskDeal.vue
new file mode 100644
index 0000000..1b4342c
--- /dev/null
+++ b/src/pages-process/components/taskDeal.vue
@@ -0,0 +1,266 @@
+
+
+
+
+ 当前环节:
+ [部门领导]
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+ {{modelShow.text1}}
+
+
+ {show1Change(val,'show1')}" modalTitle="用户选择" :multi="false"
+ @close="() => (modelShow.show1 = false)">
+
+
+
+
+
+
+
+
+
+ 处理意见
+
+
+
+ 选择常用审批语
+
+
+
+
+
+
+
+
+
+
+
+ 上传附件
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue
index 93928dc..c206f30 100644
--- a/src/pages-process/taskHandle.vue
+++ b/src/pages-process/taskHandle.vue
@@ -14,8 +14,7 @@
- 内容2
-
+
@@ -76,6 +75,7 @@
import qs from 'qs';
import { getCurrentInstance } from 'vue'
import DynamicLink from './components/DynamicLink.vue'
+ import taskDeal from './components/taskDeal.vue'
const { proxy } = getCurrentInstance()
diff --git a/src/pages-process/test.vue b/src/pages-process/test.vue
deleted file mode 100644
index b2ad5bf..0000000
--- a/src/pages-process/test.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- test
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index c8e555f..6a0a9bb 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -479,9 +479,14 @@
"navigationStyle": "custom",
"navigationBarTitleText": "任务处理"
}
- },
+ }
+ ]
+ },
+ {
+ "root": "pages-bpm",
+ "pages": [
{
- "path": "test",
+ "path": "leaveApplication/index",
"type": "page"
}
]
diff --git a/src/static/add.png b/src/static/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..917480a272245032205a826a64faaf672506b5cd
GIT binary patch
literal 1166
zcmV;91abR`P)xY@6rEEon)&q)ob-e0q}So_l^d
z_ndqFhp6%6dERBN>pl!%8_6{yay7|S074NtP4WzYlOl4UrKRP=csxE)%hsH4Q8t@h
z9*IOcMC3`5<0A42fUg0ZBKbQ2M?_WvxQ^r<05;p-0PK&&V!INF#JRbAR0Z%n&v9LM
z2g%(c^1X=cEEEdEp67*gZD{RcvDn=t`)s5DJfBLXULz@$>?#7}a=9xDg~CA*X$7!T
zDfL#h4XVM22z}q*PO=xka4Z(vRw)`60c5k;8zYg(M*w0X@_^R*hxv|auJ^{6n@JuP
zk$f12n=_frNcs9%0QS5c$Fb*op5#MHsXs2o`LwO?``6gqA-SYjEN;kTGH0jX%>WDz
z4mORAjeQDWHGtN|az5>7U|`_d@$vDaBuAQ?o9~~lk{JMFj3(JZa#JdmI#J6%H^w|p
zGE_>vQ_Fha_wNMoIe=YCDc{;m0d#kFuZ%<@zuHHwbyqE$*)_(P12#F8QjgVP^8(5C
zXf(PynN0pY1z?QX3t+43y4NQXiGSbz=XMC7)q
zS|(4<0Y6yjp6Kc6X(QQh0saB7!#14%10W2;*VF0ryBF?l8x??@1sD;LL9MlE@DV%*
zV7pDi&+PT6wSKmd0LGY?Nw!*mS4rNkl)A5x0KV@Z0dUM7!4?4ThhexpolcL{1F?`^
zQ0hG^qS5GS09$D9W)b;IMB230Z#M$KCZLGy$>;OS%A3(frPPLcq}M_sV5M3R1jlUN
zDW&35042rp8_B1YQu}I+!a@LoAc%)y_>$u|H>6UjQ!|3Z_kAlK+eF0nh3{&Cuosnx
z6f4zvCHvmq-dn;j{7OV#(ORcx1c`kp<-)LtTt)J(#g=4UU0ti1nwpLR_%j-f-kVG&
z^RocTj^axIVI&*%468|mg9PK`0k0C)hNBDu6Q2_F%W
zZ|zkoB2mY2){4k_0QZozgX%dEu}aI+TA!b*qUHsdHqPa8m*?|&JNeEU&utk3IAh0i
g5wYbvRL^++A2&Eqi8kr;0RR9107*qoM6N<$g34YpR{#J2
literal 0
HcmV?d00001
diff --git a/src/static/user27.png b/src/static/user27.png
new file mode 100644
index 0000000000000000000000000000000000000000..12d5c8b2571fa25c8364b53ec9ed7a3c6f370419
GIT binary patch
literal 1102
zcmV-U1hM;xP)4Pu+U?GrY_sk?dwED0+b9WLk
zTE#plDE`obpceH-3__Hm)?ZXGV)aF^(DuQQiaYnniL7Y}I9jPxUiXCQ=|)8$aU5T5j5z>6NvNFy@Hv31
z09=qiTXfFtjiTs_BD`MxJ;@|VvY&|d5vhdjK2+Fwe{n`2t&Op9An9fL+Xd$ah@JuN#?J
z0F%zSu_%hZ@&%3Kc$+ciO8`$WbJ=%X5t$DGY-Z+>egUnuCjflM%;Wuz?G_nP9bx7j
z{Q_ER-&Y-C=0e$6i`|XP85Nl`YR|Mz(^Jem;rpsOou+!derXT{Kl)%4>Wqlo8HVAT
zMPR*jCf`Rz5b#mp9{@bg%rACBOVji^=iDd%nF1?tqtVzWBCTBWu817Wvh48m^z`v0
zNzNmpod9mig>GGL(%hyv#u#zVtuDO%-s?2AJ9Ws~+P#pM5iQqsSvyVBEzY^;0bF1B
ze*SVe=B))<&p784SW5|Qi`tAaNB*~Zre3daFO^E0L}U{Yot5v4wTsXi=h(o&zz5}W
zSrzynrWiia=@^;0xw-RKR#wVHbQgdzAD}j$mjS%S%!l=v5($DpRk_gCk+Ig^51;~I
zD-r!7BAi(vMk%7gnV%Rj*PW-FMy{-WXTwFbG2IaQq69Yt$hQ)
z9RQ}7Iqpd&Ns@<&=vg9)s?}=ZJBhDfzS#Ew3^Vg+PcqipmjLV$ku6~ue(O6)KYooy
z<4F7^pZ}wuNql`9jfO5(7u~ZqrX)#z1#mJ9!z+Ek`}M2U
zYMV=?l15!W0(W&AuaVhsz1t5dpLvvwexU8tPgDJd9vmE8n4Fx{T=TEZT6>L%+(1No
z^5oik&%|+jZx95#MdbF@>>_fSh?YfUnTUP^u$;G!1Vv;Jz&Wi(M6LUv4fB~W3{_aW
zTDt;kS)h6_LPR4XqSs*&8P;Q&w^A3R)A_#>8qrfkbW%h#d!Nv2mSqRDAS(*>pY=83
U373}$3IG5A07*qoM6N<$f=zu11poj5
literal 0
HcmV?d00001
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 39e6179..4113370 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -53,7 +53,7 @@ interface NavigateToOptions {
"/pages-politics/health/add" |
"/pages-process/approvalTabbar" |
"/pages-process/taskHandle" |
- "/pages-process/test";
+ "/pages-bpm/leaveApplication/index";
}
interface RedirectToOptions extends NavigateToOptions {}
diff --git a/vite.config.ts b/vite.config.ts
index de02ae5..c795bd1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -70,6 +70,7 @@ export default ({ command, mode }) => {
'src/pages-integrated',
'src/pages-politics',
'src/pages-process',
+ 'src/pages-bpm'
], // 是个数组,可以配置多个,但是不能为pages里面的目录
dts: 'src/types/uni-pages.d.ts',
}),