diff --git a/components/userSelect/index.vue b/components/userSelect/index.vue new file mode 100644 index 0000000..80e985c --- /dev/null +++ b/components/userSelect/index.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/pages.json b/pages.json index 3363c66..331f710 100644 --- a/pages.json +++ b/pages.json @@ -16,7 +16,7 @@ "navigationBarTitleText": "曲阳金隅EHS-密码登录", "enablePullDownRefresh": false } - },{ + }, { "path": "pages/login/userRegister", "style": { "navigationBarTitleText": "曲阳金隅EHS-新用户注册", @@ -146,13 +146,13 @@ "enablePullDownRefresh": false } }, - + { "path": "pages/workSpace/newWork/userList", "style": { "navigationBarTitleText": "选择人员", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -160,7 +160,7 @@ "style": { "navigationBarTitleText": "添加人员", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -168,7 +168,7 @@ "style": { "navigationBarTitleText": "新增违章", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -232,7 +232,7 @@ "style": { "navigationBarTitleText": "曲阳金隅EHS-来访项目", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -240,7 +240,7 @@ "style": { "navigationBarTitleText": "新建来访项目", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -248,7 +248,7 @@ "style": { "navigationBarTitleText": "选择人员", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -256,7 +256,7 @@ "style": { "navigationBarTitleText": "来访项目查看", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -264,7 +264,7 @@ "style": { "navigationBarTitleText": "动火作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -272,7 +272,7 @@ "style": { "navigationBarTitleText": "高处作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -280,7 +280,7 @@ "style": { "navigationBarTitleText": "临时用电许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -288,7 +288,7 @@ "style": { "navigationBarTitleText": "动土作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -296,7 +296,7 @@ "style": { "navigationBarTitleText": "预热器清堵作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -304,7 +304,7 @@ "style": { "navigationBarTitleText": "吊装作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -312,7 +312,7 @@ "style": { "navigationBarTitleText": "篦冷机清大块作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -320,7 +320,7 @@ "style": { "navigationBarTitleText": "清库作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -328,7 +328,7 @@ "style": { "navigationBarTitleText": "有限空间作业许可证", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -336,7 +336,7 @@ "style": { "navigationBarTitleText": "人员确定", "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": false } }, { @@ -348,7 +348,7 @@ }, { "path": "pages/my/myInfo", - "style": { + "style": { "navigationBarTitleText": "个人信息", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -356,7 +356,7 @@ }, { "path": "pages/my/myInfoChange", - "style": { + "style": { "navigationBarTitleText": "个人信息完善", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -364,7 +364,7 @@ }, { "path": "pages/my/myCertificates", - "style": { + "style": { "navigationBarTitleText": "我的证书", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -372,7 +372,7 @@ }, { "path": "pages/my/clock_in", - "style": { + "style": { "navigationBarTitleText": "打卡记录", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -380,7 +380,7 @@ }, { "path": "pages/my/passwordChange", - "style": { + "style": { "navigationBarTitleText": "修改密码", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -388,7 +388,7 @@ }, { "path": "pages/workSpace/visit/visitor", - "style": { + "style": { "navigationBarTitleText": "我的访客库", "navigationStyle": "custom", "enablePullDownRefresh": false @@ -396,11 +396,19 @@ }, { "path": "pages/workSpace/rpj/remployee", - "style": { + "style": { "navigationBarTitleText": "我的人员库", "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path": "pages/comm/userSelect/index", + "style": { + "navigationBarTitleText": "人员选择", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/pages/comm/userSelect/index.vue b/pages/comm/userSelect/index.vue new file mode 100644 index 0000000..7d50a97 --- /dev/null +++ b/pages/comm/userSelect/index.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/pages/home/home_.vue b/pages/home/home_.vue index c7120e9..b837b9b 100644 --- a/pages/home/home_.vue +++ b/pages/home/home_.vue @@ -30,7 +30,7 @@ 待审批 - + 查看更多 @@ -73,7 +73,7 @@ 抄送我 - + 查看更多 @@ -242,14 +242,15 @@ // debugger; if(this.limitedVisit==true){ }else{ - if (type == "daiban") { + let params = `?type=${type}`; + if (type == "duty") { uni.navigateTo({ - url: "./list/ticket" + url: "./list/ticket"+params }) } - if (type == "copy") { + if (type == "cc") { uni.navigateTo({ - url: "./list/ticket" + url: "./list/ticket"+params }) } if (type == "warning") { diff --git a/pages/home/list/ticket.vue b/pages/home/list/ticket.vue index 17087c3..7990391 100644 --- a/pages/home/list/ticket.vue +++ b/pages/home/list/ticket.vue @@ -78,8 +78,8 @@ return { params: { search: '', - pageSize: 10, - pageNum: 1, + page_size: 10, + page: 1, category: 'duty' }, userId:'', @@ -88,11 +88,15 @@ ticketList: [], } }, + onLoad(params) { + this.ticketTypye = params.type; + this.params.category = params.type; + }, //上拉加载 onReachBottom() { - const totalPage = Math.ceil(this.totalNum / this.params.pageSize); - if (this.params.pageNum < totalPage) { - this.params.pageNum += 1; + const totalPage = Math.ceil(this.totalNum / this.params.page_size); + if (this.params.page < totalPage) { + this.params.page += 1; this.getTicketLists(); } else { uni.showToast({ @@ -107,7 +111,7 @@ }, //下拉刷新 onPullDownRefresh() { - this.params.pageNum = 1; + this.params.page = 1; this.ticketList = []; this.getTicketLists(); }, @@ -158,12 +162,12 @@ }) }, searchHandle() { - this.params.pageNum = 1; + this.params.page = 1; this.ticketList = []; this.getTicketLists() }, resetSearch() { - this.params.pageNum = 1; + this.params.page = 1; this.params.search = ""; this.ticketList = []; this.getTicketLists(); @@ -172,7 +176,7 @@ // debugger; this.ticketTypye = index; this.ticketList = []; - this.params.pageNum = 1; + this.params.page = 1; if (index === 'duty') { this.params.category = 'duty'; } else if (index === 'owner') { diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue index e53c5ab..1d547c3 100644 --- a/pages/workSpace/visit/visitCreate.vue +++ b/pages/workSpace/visit/visitCreate.vue @@ -58,21 +58,17 @@ --> - + 接待人 - + {{receptionist_name}} - @@ -94,7 +90,6 @@ - 来访人数 @@ -110,14 +105,10 @@