From 039cf70aa6c43672160ee6eb87afcaf10e477976 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Fri, 22 Nov 2024 09:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E5=AF=BC=E5=85=A5?=
=?UTF-8?q?=20=E5=BD=93=E7=8F=AD=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=84=E7=90=86=20=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=20=E6=8E=A5=E5=85=A5=20=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=20orgid=20=E5=AF=BC=E5=85=A5=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=20=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E4=B8=BA?=
=?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=9A=84=E5=88=97=E8=A1=A8=20=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96=E5=BD=93=E7=8F=AD=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=20requset=20=E5=9F=BA=E7=A1=80=E6=96=B9=E6=B3=95=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 1 +
pages.json | 2 +-
pages/apply/user.vue | 422 +++++++++++++++++++++++-------------------
pages/index/index.vue | 12 +-
services/apply.js | 22 ++-
utils/request.js | 16 +-
6 files changed, 272 insertions(+), 203 deletions(-)
diff --git a/main.js b/main.js
index cbe03cc..9e1951e 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,7 @@ import uView from '@/uni_modules/uview-ui'
// #ifndef VUE3
import Vue from 'vue'
+import './utils/showMsg.js'
import './uni.promisify.adaptor'
import QuerySelector from 'components/custom/query-selector.vue'
diff --git a/pages.json b/pages.json
index b7f8316..2a4711d 100644
--- a/pages.json
+++ b/pages.json
@@ -34,7 +34,7 @@
{
"path": "pages/apply/user",
"style": {
- "navigationBarTitleText": "当班员工"
+ "navigationBarTitleText": "当班工作人员"
}
},
{
diff --git a/pages/apply/user.vue b/pages/apply/user.vue
index d99ecdc..6dbb5bd 100644
--- a/pages/apply/user.vue
+++ b/pages/apply/user.vue
@@ -8,53 +8,119 @@
*
组织信息
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
@@ -80,184 +141,167 @@
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8df7118..9e13bfb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,10 +1,10 @@
-
+
+ @click="menuClick(baseListItem)" color="#304ffe">
{{baseListItem.name}}
@@ -26,6 +26,10 @@
export default {
data() {
return {
+
+ DEPARTMENT_ID: 'B18F95F4-572A-E521-1412-FA8CE50DC98A',
+ OrgId: '',
+
baseList: [
{
@@ -79,9 +83,9 @@
// })
// },
- menuClick(linkToUrl) {
+ menuClick(menuInfo) {
uni.navigateTo({
- url: linkToUrl
+ url: menuInfo.url +'?DEPARTMENT_ID='+this.DEPARTMENT_ID+'&OrgId='+menuInfo.ORG_ID
})
},
goCamera() {
diff --git a/services/apply.js b/services/apply.js
index ee89167..a12c98d 100644
--- a/services/apply.js
+++ b/services/apply.js
@@ -15,4 +15,24 @@ export const RegisterUser = (params) => {
data: params,
})
-}
\ No newline at end of file
+}
+
+//获取班组
+export const PagedDep = (params) => {
+ return request.send({
+ url: '/BI/H5Controller/PagedDep',
+ method: 'post',
+ data: params,
+ })
+}
+
+//获取某个班组的当班信息
+export const WorkerScheduling = (params) => {
+ return request.send({
+ url: '/BI/H5Controller/WorkerScheduling',
+ method: 'post',
+ data: params,
+ })
+}
+
+
diff --git a/utils/request.js b/utils/request.js
index d1fb443..faab449 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -8,7 +8,7 @@ export default {
const pages = getCurrentPages()
const currentPage = pages[pages.length - 1]
const Options = currentPage.options
- let Company = Options.Company?Options.Company:'XLK'
+ let Company = Options.Company ? Options.Company : 'XLK'
let tenantId = ''
if (Company == 'DCJD') {
tenantId = 'A0000025'
@@ -31,13 +31,13 @@ export default {
'Tenant': tenantId, // avue配置相关
...params.header
}
- if (method == "post") {
- header = {
- 'Content-Type': 'application/x-www-form-urlencoded',
- 'Tenant': tenantId,
- ...params.header
- };
- }
+ // if (method == "post") {
+ // header = {
+ // 'Content-Type': 'application/x-www-form-urlencoded',
+ // 'Tenant': tenantId,
+ // ...params.header
+ // };
+ // }
return new Promise((resolve, reject) => {
uni.request({
url: config.serviceHost(url),