diff --git a/.env.development b/.env.development
index 00d46af..e96d5b3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
# 开发环境
# 请求接口地址
-# VITE_REQUEST_BASE_URL = https://36.112.48.190
+ #VITE_REQUEST_BASE_URL = https://36.112.48.190
VITE_REQUEST_BASE_URL = http://10.75.15.249:8080
diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue
index 9e033aa..9470cc7 100644
--- a/bpm/leaveApplication/index.vue
+++ b/bpm/leaveApplication/index.vue
@@ -3,7 +3,7 @@
申请信息
- 历史查询
+ 历史查询
@@ -49,7 +49,7 @@
- 审批人：
+ {{examineleader}}：
{{info.examineleader_dictText}}
@@ -125,6 +125,7 @@
default: ''
},
})
+ const examineleader = ref('')
const imageValue = ref([])
const ifShowFj = ref(false)
const imageStyles = {
@@ -144,6 +145,12 @@
id: props.dataId
}).then((res) => {
if (res.success) {
+ if (res.result.records[0].zwmc == '单位专家' || res.result.records[0].zwmc == '基层正职' ||
+ res.result.records[0].zwmc == '高级主管') {
+ examineleader.value = '分管领导';
+ } else {
+ examineleader.value = '审批领导';
+ }
info.value = res.result.records[0]
// 构造 imageValue 数组
if (info.value.path) {
@@ -195,7 +202,7 @@
qjQueryById()
extActFlowData()
})
-
+
const goToHis = () => {
uni.navigateTo({
url: `/pages/views/renliziyuan/qingjiaxinxi/index?username=${info.value.username}`
diff --git a/pages.json b/pages.json
index 9987e01..6d5750d 100644
--- a/pages.json
+++ b/pages.json
@@ -110,14 +110,6 @@
"navigationBarTextStyle": "white"
}
},
- {
- "path": "pages/leave/application",
- "style": {
- "navigationBarTitleText": "请假申请",
- "enablePullDownRefresh": false,
- "navigationBarTextStyle": "white"
- }
- },
{
"path": "pages/checkin/index",
"style": {
@@ -256,7 +248,15 @@
"navigationBarTitleText": "请假详情",
"navigationBarTextStyle": "white"
}
- }
+ },
+ {
+ "path": "pages/views/renliziyuan/qingjiaxinxi/application",
+ "style": {
+ "navigationBarTitleText": "请假申请",
+ "enablePullDownRefresh": false,
+ "navigationBarTextStyle": "white"
+ }
+ },
],
"tabBar": {
"color": "#333333",
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a3df2cb..976a718 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -98,17 +98,17 @@
});
/*生产环境 begin */
- loginApi({
- username: un,
- password: pw,
- ip: getDeviceIp()
+ // loginApi({
+ // username: un,
+ // password: pw,
+ // ip: getDeviceIp()
/*生产环境 end */
/*开发环境 begin */
- // localLoginApi({
- // username: username.value,
- // password: password.value,
- // captcha: 'app'
+ localLoginApi({
+ username: username.value,
+ password: password.value,
+ captcha: 'app'
/*开发环境 end */
}).then((loginres) => {
if (loginres.success) {
@@ -202,7 +202,6 @@
}
}
}
- console.log(deviceIp)
return deviceIp;
// #endif
}
diff --git a/pages/leave/application.vue b/pages/views/renliziyuan/qingjiaxinxi/application.vue
similarity index 96%
rename from pages/leave/application.vue
rename to pages/views/renliziyuan/qingjiaxinxi/application.vue
index cca4f36..1854a6c 100644
--- a/pages/leave/application.vue
+++ b/pages/views/renliziyuan/qingjiaxinxi/application.vue
@@ -51,10 +51,10 @@
-
+
- 审批领导：
+ {{examineleader}}：
@@ -155,8 +155,8 @@
/**审批领导*/
const typeArr = ref([])
const typeIndex = ref(null)
- /**判断是否显示审批领导字段*/
- const ifShow = ref(true)
+ /**判断显示审批 / 分管 领导*/
+ const examineleader = ref(true)
/**职位层级*/
const zwcj = ref('')
/**出发地*/
@@ -205,10 +205,8 @@
if (!type.value) return proxy.$toast('请选择请假类型')
if (!beginTime.value) return proxy.$toast('请选择开始时间')
if (!endTime.value) return proxy.$toast('请选择结束时间')
- if (ifShow.value) {
- if (typeIndex.value == null) { //副职、员工需要选择审批领导
- return proxy.$toast('请选择审批领导')
- }
+ if (typeIndex.value == null) { //副职、员工需要选择审批领导
+ return proxy.$toast('请选择' + examineleader.value)
}
if (!departure.value.trim()) return proxy.$toast('请输入出发地')
if (!destination.value.trim()) return proxy.$toast('请输入目的地')
@@ -270,7 +268,9 @@
typeArr.value = res.result.list
zwcj.value = res.result.zwmc
if (zwcj.value == '单位专家' || zwcj.value == '基层正职' || zwcj.value == '高级主管') {
- ifShow.value = false;
+ examineleader.value = '分管领导';
+ }else{
+ examineleader.value = '审批领导';
}
} else {
proxy.$toast(res.message);
diff --git a/pages/views/zhongheguanli/zhiban/index.vue b/pages/views/zhongheguanli/zhiban/index.vue
index 84ddae1..a2cf23e 100644
--- a/pages/views/zhongheguanli/zhiban/index.vue
+++ b/pages/views/zhongheguanli/zhiban/index.vue
@@ -120,43 +120,50 @@
\ No newline at end of file