diff --git a/env/.env.development b/env/.env.development
index 639f316..44dd13a 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -4,7 +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.249:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
\ No newline at end of file
diff --git a/src/pages-home/home/home.vue b/src/pages-home/home/home.vue
index f2d472a..16c7130 100644
--- a/src/pages-home/home/home.vue
+++ b/src/pages-home/home/home.vue
@@ -1,20 +1,20 @@
-{
- layout: 'default',
- style: {
- navigationBarTitleText: '',
- },
-}
+ {
+ layout: 'default',
+ style: {
+ navigationBarTitleText: '',
+ },
+ }
-
+
+ //
+
\ No newline at end of file
diff --git a/src/pages/humanResources/absence/apply.vue b/src/pages-humanResource/absence/apply.vue
similarity index 81%
rename from src/pages/humanResources/absence/apply.vue
rename to src/pages-humanResource/absence/apply.vue
index afa2171..a15c445 100644
--- a/src/pages/humanResources/absence/apply.vue
+++ b/src/pages-humanResource/absence/apply.vue
@@ -69,6 +69,9 @@
import {
getEnvBaseUrl
} from '@/utils/index'
+ import {
+ startMutilProcessApi
+ } from '@/api/process'
const message = useMessage()
const toast = useToast()
@@ -174,12 +177,11 @@
})
.then(() => {
addApi(submitData).then(res => {
- console.log('----', res)
- // if (res.success) {
- // startMutilProcess(res.message)
- // } else {
- toast.warning(res.message)
- // }
+ if (res.success) {
+ startMutilProcess(res.message)
+ } else {
+ toast.warning(res.message)
+ }
})
})
.catch(() => {})
@@ -187,6 +189,24 @@
})
}
+ const startMutilProcess = (id) => {
+ startMutilProcessApi({
+ flowCode: "dev_cxc_qxj",
+ id,
+ formUrl: "modules/qxj/modules/CxcQxjBpmModel",
+ formUrlMobile: "leaveApplication"
+ }).then((res) => {
+ if (res.success) {
+ toast.success(res.message)
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 2000)
+ }
+ }).catch((err) => {
+ console.log(err);
+ })
+ }
+
function formatDate(date) {
date = new Date(date)
const year = date.getFullYear()
@@ -226,10 +246,7 @@
examineleader.value = '审批领导';
}
} else {
- uni.showToast({
- title: res.message,
- icon: 'error'
- })
+ toast.warning(res.message)
setTimeout(() => {
handleClickLeft()
}, 1000)
@@ -242,10 +259,7 @@
queryHisDateApi(userStore.userInfo.username).then(res => {
if (ress == '员工') { // 员工需要先销假,才能新增请假信息
if (res.endtime != null && res.resumptiontime == null) {
- uni.showToast({
- title: '请先销假上一条请假信息!',
- icon: 'error'
- })
+ toast.warning('请先销假上一条请假信息!')
setTimeout(() => {
uni.navigateBack()
}, 2000)
@@ -259,57 +273,49 @@
}
}
resDate.value = res.resumptiontime ? dateStringToTimestamp(res.resumptiontime) :
- res.endtime ? dateStringToTimestamp(res.endtime, 1) : null
+ res.endtime ? dateStringToTimestamp(res.endtime, 2) : null
queryMinDate();
});
})
}
+ const queryMinDate = () => {
+ const today = new Date();
+ const threeMonthsAgo = new Date(today);
+ threeMonthsAgo.setMonth(today.getMonth() - 3);
+ if (resDate.value && model.type[model.type.length - 1] !== '干部离返濮报备') {
+ minBegintime.value = resDate.value;
+ } else {
+ minBegintime.value = threeMonthsAgo.getTime();
+ }
+ model.begintime = resDate.value ?
+ (resDate.value > dateStringToTimestamp() ? resDate.value : dateStringToTimestamp()) :
+ dateStringToTimestamp(null, 1);
+ minEndtime.value = model.begintime;
+ };
+
/**
* 将日期字符串转换为13位时间戳(支持yyyymmdd和yyyy-mm-dd格式)
* @param {string} dateStr
* @returns {number} 13位时间戳(毫秒)
*/
function dateStringToTimestamp(dateStr, flag) {
- if (dateStr != null) {
+ const date = new Date();
+ if (flag === 1) {
+ date.setDate(date.getDate() + 1);
+ } else if (dateStr) {
const normalized = dateStr.replace(/-/g, '');
- const year = parseInt(normalized.substring(0, 4));
- const month = parseInt(normalized.substring(4, 6)) - 1;
- const day = parseInt(normalized.substring(6, 8));
- const date = new Date(year, month, day);
- // 如果flag为1,则增加一天
- if (flag === 1) {
+ date.setFullYear(
+ parseInt(normalized.substring(0, 4)),
+ parseInt(normalized.substring(4, 6)) - 1,
+ parseInt(normalized.substring(6, 8))
+ );
+ if (flag === 2) {
date.setDate(date.getDate() + 1);
}
- return date.getTime();
- } else { // dateStr为空返回当天时间戳
- const today = new Date();
- today.setHours(0, 0, 0, 0);
- return today.getTime();
}
- }
-
- const queryMinDate = () => {
- const today = new Date(); // 获取当前日期
- if (resDate.value) {
- if (model.type[model.type.length - 1] != '干部离返濮报备') {
- minBegintime.value = resDate.value;
- } else {
- const today = new Date(); // 当前日期
- const sixMonthsAgo = new Date(today);
- sixMonthsAgo.setMonth(today.getMonth() - 3); // 3个月前 min-date尽量不要设置过大,避免大量数据的计算和传递导致页面性能低下。
- minBegintime.value = sixMonthsAgo.getTime();
- }
- model.begintime = resDate.value > dateStringToTimestamp() ? resDate.value : dateStringToTimestamp()
- } else {
- const today = new Date(); // 当前日期
- const sixMonthsAgo = new Date(today);
- sixMonthsAgo.setMonth(today.getMonth() - 3); // 3个月前 min-date尽量不要设置过大,避免大量数据的计算和传递导致页面性能低下。
- minBegintime.value = sixMonthsAgo.getTime();
- // 如果 resDate 不存在 返回当天
- model.begintime = dateStringToTimestamp()
- }
- minEndtime.value = model.begintime
+ date.setHours(0, 0, 0, 0);
+ return date.getTime();
}
const begintimeConfirm = () => {
diff --git a/src/pages-humanResource/absence/index.vue b/src/pages-humanResource/absence/index.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/src/pages-humanResource/absence/index.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/integrated/duty/index.vue b/src/pages-integrated/duty/index.vue
similarity index 100%
rename from src/pages/integrated/duty/index.vue
rename to src/pages-integrated/duty/index.vue
diff --git a/src/pages/operate/file/detail.vue b/src/pages-operate/file/detail.vue
similarity index 100%
rename from src/pages/operate/file/detail.vue
rename to src/pages-operate/file/detail.vue
diff --git a/src/pages/operate/file/index.vue b/src/pages-operate/file/index.vue
similarity index 100%
rename from src/pages/operate/file/index.vue
rename to src/pages-operate/file/index.vue
diff --git a/src/pages/operate/sc/index.vue b/src/pages-operate/sc/index.vue
similarity index 100%
rename from src/pages/operate/sc/index.vue
rename to src/pages-operate/sc/index.vue
diff --git a/src/pages.json b/src/pages.json
index 8a00adb..127bf80 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -58,13 +58,6 @@
"navigationBarTitleText": "登录页"
}
},
- {
- "path": "pages/about/about",
- "type": "page",
- "style": {
- "navigationBarTitleText": "关于"
- }
- },
{
"path": "pages/annotation/annotationDetail",
"type": "page",
@@ -83,51 +76,6 @@
"navigationStyle": "custom"
}
},
- {
- "path": "pages/demo/demo",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationBarTitleText": "demo演示",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/demo/form",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationBarTitleText": "表单",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/demo/indexBar",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "通讯录"
- }
- },
- {
- "path": "pages/demo/selectPicker",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationBarTitleText": "单选多选",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/demo/tree",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationBarTitleText": "树示例",
- "navigationStyle": "custom"
- }
- },
{
"path": "pages/index/index",
"type": "page",
@@ -217,51 +165,6 @@
"navigationBarTitleText": "工作台",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/humanResources/absence/apply",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "请假申请"
- }
- },
- {
- "path": "pages/integrated/duty/index",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "干部值班"
- }
- },
- {
- "path": "pages/operate/file/detail",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "厂级制度详情"
- }
- },
- {
- "path": "pages/operate/file/index",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "公文/通知公告/法律法规/上级制度/厂级制度"
- }
- },
- {
- "path": "pages/operate/sc/index",
- "type": "page",
- "layout": "default",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "三册"
- }
}
],
"subPackages": [
@@ -406,6 +309,74 @@
}
}
]
+ },
+ {
+ "root": "pages-operate",
+ "pages": [
+ {
+ "path": "file/detail",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "厂级制度详情"
+ }
+ },
+ {
+ "path": "file/index",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "公文/通知公告/法律法规/上级制度/厂级制度"
+ }
+ },
+ {
+ "path": "sc/index",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "三册"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages-humanResource",
+ "pages": [
+ {
+ "path": "absence/apply",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "请假申请"
+ }
+ },
+ {
+ "path": "absence/index",
+ "type": "page"
+ }
+ ]
+ },
+ {
+ "root": "pages-integrated",
+ "pages": [
+ {
+ "path": "duty/index",
+ "type": "page",
+ "layout": "default",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "干部值班"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages-process",
+ "pages": []
}
]
}
\ No newline at end of file
diff --git a/src/pages/about/about.vue b/src/pages/about/about.vue
deleted file mode 100644
index 990f548..0000000
--- a/src/pages/about/about.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-
-{
- style: {
- navigationBarTitleText: '关于',
- },
-}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/about/components/request.vue b/src/pages/about/components/request.vue
deleted file mode 100644
index b077f40..0000000
--- a/src/pages/about/components/request.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-{
- layout: 'demo',
- style: {
- navigationBarTitleText: '请求',
- },
-}
-
-
-
-
- 使用的是 laf 云后台
-
-
- {{ recommendUrl }}
-
-
-
-
- {{ recommendUrl }}
-
-
-
- 发送请求
-
- loading...
-
- 请求数据如下
- {{ JSON.stringify(data) }}
-
-
- 重置数据
-
-
-
-
diff --git a/src/pages/about/components/upload.vue b/src/pages/about/components/upload.vue
deleted file mode 100644
index 90df95f..0000000
--- a/src/pages/about/components/upload.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationBarTitleText: '上传-状态一体化',
- },
-}
-
-
-
-
- 选择图片并上传
- 上传...
-
- 上传后返回的接口数据:
- {{ data }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/demo/demo.vue b/src/pages/demo/demo.vue
deleted file mode 100644
index f77694c..0000000
--- a/src/pages/demo/demo.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationBarTitleText: 'demo演示',
- navigationStyle: 'custom',
- },
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
- (imgPreview.show = true)"
- >
- (imgPreview.show = false)"
- >
-
- 跳转页面
-
-
-
-
- 树组件
- 通讯录
- 单选多选
- 表单
-
-
-
-
- toast.info(`点击了${item.text}`)"
- >
-
-
-
-
-
-
-
-
-
-
-
-
- 常规
- 警告
- 成功
- 错误
-
- 基本用法(无icon)
-
- 确认提示
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/demo/form.vue b/src/pages/demo/form.vue
deleted file mode 100644
index 57b1501..0000000
--- a/src/pages/demo/form.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationBarTitleText: '表单',
- navigationStyle: 'custom',
- },
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/demo/indexBar.vue b/src/pages/demo/indexBar.vue
deleted file mode 100644
index bfb17f2..0000000
--- a/src/pages/demo/indexBar.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationStyle: 'custom',
- navigationBarTitleText: '通讯录',
- },
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/demo/selectPicker.vue b/src/pages/demo/selectPicker.vue
deleted file mode 100644
index 14528ab..0000000
--- a/src/pages/demo/selectPicker.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationBarTitleText: '单选多选',
- navigationStyle: 'custom',
- },
-}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/demo/tree.vue b/src/pages/demo/tree.vue
deleted file mode 100644
index c982694..0000000
--- a/src/pages/demo/tree.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationBarTitleText: '树示例',
- navigationStyle: 'custom',
- },
-}
-
-
-
-
-
-
- 全选
- 取消全选
-
-
- 展开全部节点
- 收起全部节点
-
-
- 展开节点
- 收起节点
-
-
- 选中指定节点
- 取消选中指定节点
-
-
-
-
- 多选
-
-
-
- 单选
-
-
-
- 默认展开指定节点
-
-
-
- 异步加载数据
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/onlinePreview/detail.vue b/src/pages/onlinePreview/detail.vue
index 17092c1..392fe7f 100644
--- a/src/pages/onlinePreview/detail.vue
+++ b/src/pages/onlinePreview/detail.vue
@@ -16,7 +16,7 @@
-
@@ -24,7 +24,7 @@
-
diff --git a/src/pages/onlinePreview/onlinePreview.vue b/src/pages/onlinePreview/onlinePreview.vue
index 19a399b..a8f706b 100644
--- a/src/pages/onlinePreview/onlinePreview.vue
+++ b/src/pages/onlinePreview/onlinePreview.vue
@@ -27,9 +27,7 @@
onLoad((options) => {
let base64 = new Base64();
var url = baseUrl + JSON.parse(options.data);
- console.log('-----111', url)
fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(base64.encode(url))
- console.log('-----222', fileUrl)
})
diff --git a/src/pages/onlinePreview/onlinePreviewH5.vue b/src/pages/onlinePreview/onlinePreviewH5.vue
index 95970d4..5ce7b3c 100644
--- a/src/pages/onlinePreview/onlinePreviewH5.vue
+++ b/src/pages/onlinePreview/onlinePreviewH5.vue
@@ -30,9 +30,7 @@
console.log(options)
let url = JSON.parse(options.data)
url = baseUrl + url;
- console.log(url)
fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url))
- console.log(fileUrl)
})
diff --git a/src/pagess-process/approvalTabbar.vue b/src/pagess-process/approvalTabbar.vue
new file mode 100644
index 0000000..1a56e51
--- /dev/null
+++ b/src/pagess-process/approvalTabbar.vue
@@ -0,0 +1,45 @@
+
+ {
+ layout: 'default',
+ style: {
+ navigationStyle: 'custom',
+ navigationBarTitleText: '流程审批导航',
+ },
+ }
+
+
+
+
+
+
+
+
+ 内容1
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagess-process/components/myTask.vue b/src/pagess-process/components/myTask.vue
new file mode 100644
index 0000000..c4679a4
--- /dev/null
+++ b/src/pagess-process/components/myTask.vue
@@ -0,0 +1,170 @@
+
+
+
+ 加载中...
+
+
+
+
+
+ 当前环节:
+
+
+ {{item.taskName}}
+
+
+
+
+ 流程名称:
+
+
+ {{item.processDefinitionName}}
+
+
+
+
+ {{item.taskBeginTime?item.taskBeginTime.substring(0,10):''}}
+
+ {{item.processApplyUserName}}
+
+
+
+
+ 办理
+
+
+ 委托
+
+
+
+
+ 签收
+
+
+
+
+
+
+
+
+
+ 正在加载...
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagess-process/taskHandle.vue b/src/pagess-process/taskHandle.vue
new file mode 100644
index 0000000..6d8051c
--- /dev/null
+++ b/src/pagess-process/taskHandle.vue
@@ -0,0 +1,98 @@
+
+ {
+ layout: 'default',
+ style: {
+ navigationStyle: 'custom',
+ navigationBarTitleText: '任务处理',
+ },
+ }
+
+
+
+
+
+
+
+ 内容2
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index e08c24e..0364fc7 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -5,14 +5,8 @@
interface NavigateToOptions {
url: "/pages/login/login" |
- "/pages/about/about" |
"/pages/annotation/annotationDetail" |
"/pages/annotation/annotationList" |
- "/pages/demo/demo" |
- "/pages/demo/form" |
- "/pages/demo/indexBar" |
- "/pages/demo/selectPicker" |
- "/pages/demo/tree" |
"/pages/index/index" |
"/pages/message/message" |
"/pages/more/more" |
@@ -23,11 +17,6 @@ interface NavigateToOptions {
"/pages/process/taskHandle" |
"/pages/user/people" |
"/pages/workHome/index" |
- "/pages/humanResources/absence/apply" |
- "/pages/integrated/duty/index" |
- "/pages/operate/file/detail" |
- "/pages/operate/file/index" |
- "/pages/operate/sc/index" |
"/pages-home/home/home" |
"/pages-message/chat/chat" |
"/pages-message/contacts/contacts" |
@@ -40,7 +29,13 @@ interface NavigateToOptions {
"/pages-work/onlinePage/onlineEdit" |
"/pages-sub/online/online" |
"/pages-sub/online/onlineCard" |
- "/pages-sub/online/onlineTable";
+ "/pages-sub/online/onlineTable" |
+ "/pages-operate/file/detail" |
+ "/pages-operate/file/index" |
+ "/pages-operate/sc/index" |
+ "/pages-humanResource/absence/apply" |
+ "/pages-humanResource/absence/index" |
+ "/pages-integrated/duty/index";
}
interface RedirectToOptions extends NavigateToOptions {}
diff --git a/vite.config.ts b/vite.config.ts
index 99e0a6a..d4b48e8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -65,6 +65,10 @@ export default ({ command, mode }) => {
'src/pages-user',
'src/pages-work',
'src/pages-sub',
+ 'src/pages-operate',
+ 'src/pages-humanResource',
+ 'src/pages-integrated',
+ 'src/pages-process',
], // 是个数组,可以配置多个,但是不能为pages里面的目录
dts: 'src/types/uni-pages.d.ts',
}),