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 0000000..917480a
Binary files /dev/null and b/src/static/add.png differ
diff --git a/src/static/user27.png b/src/static/user27.png
new file mode 100644
index 0000000..12d5c8b
Binary files /dev/null and b/src/static/user27.png differ
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',
}),