diff --git a/env/.env.development b/env/.env.development
index 44dd13a..4451dc4 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.249: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/SelectUser/components/SelectUserModal.vue b/src/components/SelectUser/components/SelectUserModal.vue
index c5f46fc..30346a0 100644
--- a/src/components/SelectUser/components/SelectUserModal.vue
+++ b/src/components/SelectUser/components/SelectUserModal.vue
@@ -17,14 +17,19 @@
>
+ >
+
+ 姓名:
+
+
-
+
@@ -215,7 +220,7 @@ const queryList = (pageNo, pageSize) => {
pararms[search.field] = `*${search.keyword}*`
}
if(dept.value){
- pararms['orgCode'] = dept.value
+ pararms['orgCode'] = dept.value+'*'
}
http
.get(`${api.userlist}`, pararms)
@@ -266,6 +271,13 @@ init()
:deep(.wd-radio-group) {
--wot-radio-bg: tranparent;
}
+:deep(.wd-search__cover){
+ background-color: #fff;
+}
+:deep(.wd-search__block){
+ background-color: #fff;
+}
+
.list {
display: flex;
align-items: center;
diff --git a/src/pages-process/components/DynamicLink.vue b/src/pages-process/components/DynamicLink.vue
new file mode 100644
index 0000000..1287869
--- /dev/null
+++ b/src/pages-process/components/DynamicLink.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages-process/components/myTask.vue b/src/pages-process/components/myTask.vue
index d06142f..8ac561f 100644
--- a/src/pages-process/components/myTask.vue
+++ b/src/pages-process/components/myTask.vue
@@ -143,7 +143,10 @@
console.log(11)
//办理任务,直接进入办理页面
uni.navigateTo({
- url:`/pages-process/taskHandle?data=${JSON.stringify(item)}`
+ url:`/pages-process/taskHandle`,
+ success:(res) =>{
+ res.eventChannel.emit('taskData',JSON.stringify(item))
+ }
})
}else{
message
diff --git a/src/pages-process/taskHandle.vue b/src/pages-process/taskHandle.vue
index 4b0461e..93928dc 100644
--- a/src/pages-process/taskHandle.vue
+++ b/src/pages-process/taskHandle.vue
@@ -11,9 +11,11 @@
+
内容2
+
@@ -72,6 +74,11 @@
} from '@/utils/index'
import { json } from 'stream/consumers';
import qs from 'qs';
+ import { getCurrentInstance } from 'vue'
+ import DynamicLink from './components/DynamicLink.vue'
+
+ const { proxy } = getCurrentInstance()
+
const formData = ref({})
const nodePositionInfo = ref({})
@@ -93,48 +100,52 @@
}
onLoad((options) => {
- let useData = JSON.parse(options.data);
- console.log(123)
- getProcessNodeInfo({taskId:useData.id}).then(res=>{
- console.log(res)
- if(res.success){
- let data = {
- dataId:res.result.dataId,
- taskId:useData.id,
- taskDefKey:useData.taskId,
- procInsId:useData.processInstanceId,
- tableName:res.result.tableName,
- permissionList:res.result.permissionList,
- vars:res.result.records
+ const eventChannel = proxy.getOpenerEventChannel();
+ eventChannel.on('taskData',(params)=>{
+ let useData = JSON.parse(params);
+ console.log(123)
+ getProcessNodeInfo({taskId:useData.id}).then(res=>{
+ console.log(res)
+ if(res.success){
+ let data = {
+ dataId:res.result.dataId,
+ taskId:useData.id,
+ taskDefKey:useData.taskId,
+ procInsId:useData.processInstanceId,
+ tableName:res.result.tableName,
+ permissionList:res.result.permissionList,
+ vars:res.result.records
+ }
+ formData.value = data;//流程信息
+
+ let tempFormUrl = res.result.formUrlMobile;
+
+ path.value = tempFormUrl; //url路径
}
- formData.value = data;//流程信息
-
- let tempFormUrl = res.result.formUrlMobile;
-
- path.value = tempFormUrl; //url路径
- }
- })
- console.log(useData)
- getNodePositionInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
- console.log(res)
- if (res.success) {
- nodePositionInfo.value = res.result
- console.log(res)
- }
- })
-
- getHisInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
- console.log(res)
- if (res.success) {
- console.log(res)
- dataSource.value = res.result.records
- //查找最后一个,结束时间
- completedNum.value = res.result.records.length
- res.result.records.forEach((item,index)=>{
- if(item.endTime) completedNum.value = index+1
- })
- }
+ })
+ console.log(useData)
+ getNodePositionInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
+ console.log(res)
+ if (res.success) {
+ nodePositionInfo.value = res.result
+ console.log(res)
+ }
+ })
+
+ getHisInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
+ console.log(res)
+ if (res.success) {
+ console.log(res)
+ dataSource.value = res.result.records
+ //查找最后一个,结束时间
+ completedNum.value = res.result.records.length
+ res.result.records.forEach((item,index)=>{
+ if(item.endTime) completedNum.value = index+1
+ })
+ }
+ })
})
+
})
const imgPath = computed(()=>{
diff --git a/src/pages-process/test.vue b/src/pages-process/test.vue
new file mode 100644
index 0000000..b2ad5bf
--- /dev/null
+++ b/src/pages-process/test.vue
@@ -0,0 +1,18 @@
+
+
+ test
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 81993e6..c8e555f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -479,6 +479,10 @@
"navigationStyle": "custom",
"navigationBarTitleText": "任务处理"
}
+ },
+ {
+ "path": "test",
+ "type": "page"
}
]
}
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 4e31c48..39e6179 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -52,7 +52,8 @@ interface NavigateToOptions {
"/pages-integrated/duty/index" |
"/pages-politics/health/add" |
"/pages-process/approvalTabbar" |
- "/pages-process/taskHandle";
+ "/pages-process/taskHandle" |
+ "/pages-process/test";
}
interface RedirectToOptions extends NavigateToOptions {}